Mercurial > mplayer.hg
annotate libvo/vo_x11.c @ 927:2098be9cb19b
mScreen removed -> segfault solved
author | arpi_esp |
---|---|
date | Fri, 01 Jun 2001 16:38:42 +0000 |
parents | db06ae8967eb |
children | 71b8911ec3da |
rev | line source |
---|---|
1 | 1 #define DISP |
2 | |
3 /* | |
4 * video_out_x11.c,X11 interface | |
5 * | |
6 * | |
7 * Copyright ( C ) 1996,MPEG Software Simulation Group. All Rights Reserved. | |
8 * | |
9 * Hacked into mpeg2dec by | |
10 * | |
11 * Aaron Holtzman <aholtzma@ess.engr.uvic.ca> | |
12 * | |
13 * 15 & 16 bpp support added by Franck Sicard <Franck.Sicard@solsoft.fr> | |
14 * | |
15 */ | |
16 | |
17 #include <stdio.h> | |
18 #include <stdlib.h> | |
19 #include <string.h> | |
20 #include <signal.h> | |
21 | |
22 #include "config.h" | |
23 #include "video_out.h" | |
24 #include "video_out_internal.h" | |
25 | |
26 LIBVO_EXTERN( x11 ) | |
27 | |
28 #include <X11/Xlib.h> | |
29 #include <X11/Xutil.h> | |
30 #include <X11/extensions/XShm.h> | |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
31 #ifdef HAVE_XF86VM |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
32 #include <X11/extensions/xf86vmode.h> |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
33 #endif |
1 | 34 #include <errno.h> |
35 #include "yuv2rgb.h" | |
36 | |
31 | 37 #include "x11_common.h" |
38 | |
354 | 39 #include "fastmemcpy.h" |
616 | 40 #include "sub.h" |
350 | 41 |
1 | 42 static vo_info_t vo_info = |
43 { | |
44 "X11 ( XImage/Shm )", | |
45 "x11", | |
46 "Aaron Holtzman <aholtzma@ess.engr.uvic.ca>", | |
47 "" | |
48 }; | |
49 | |
50 /* private prototypes */ | |
51 static void Display_Image ( XImage * myximage,unsigned char *ImageData ); | |
52 | |
53 /* since it doesn't seem to be defined on some platforms */ | |
54 int XShmGetEventBase( Display* ); | |
55 | |
56 /* local data */ | |
57 static unsigned char *ImageData; | |
58 | |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
59 #ifdef HAVE_XF86VM |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
60 XF86VidModeModeInfo **vidmodes=NULL; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
61 #endif |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
62 |
1 | 63 /* X11 related variables */ |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
865
diff
changeset
|
64 //static Display *mDisplay; |
1 | 65 static Window mywindow; |
66 static GC mygc; | |
67 static XImage *myximage; | |
68 static int depth,bpp,mode; | |
69 static XWindowAttributes attribs; | |
70 static int X_already_started=0; | |
71 | |
31 | 72 //static int vo_dwidth,vo_dheight; |
1 | 73 |
74 #define SH_MEM | |
75 | |
76 #ifdef SH_MEM | |
77 | |
78 #include <sys/ipc.h> | |
79 #include <sys/shm.h> | |
80 #include <X11/extensions/XShm.h> | |
81 | |
82 //static int HandleXError _ANSI_ARGS_( ( Display * dpy,XErrorEvent * event ) ); | |
83 static void InstallXErrorHandler ( void ); | |
84 static void DeInstallXErrorHandler ( void ); | |
85 | |
86 static int Shmem_Flag; | |
87 static int Quiet_Flag; | |
88 static XShmSegmentInfo Shminfo[1]; | |
89 static int gXErrorFlag; | |
90 static int CompletionType=-1; | |
91 | |
767
372042df5c77
Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents:
616
diff
changeset
|
92 static int Flip_Flag; |
372042df5c77
Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents:
616
diff
changeset
|
93 |
1 | 94 static void InstallXErrorHandler() |
95 { | |
96 //XSetErrorHandler( HandleXError ); | |
97 XFlush( mDisplay ); | |
98 } | |
99 | |
100 static void DeInstallXErrorHandler() | |
101 { | |
102 XSetErrorHandler( NULL ); | |
103 XFlush( mDisplay ); | |
104 } | |
105 | |
106 #endif | |
107 | |
108 static uint32_t image_width; | |
109 static uint32_t image_height; | |
110 static uint32_t image_format; | |
111 | |
31 | 112 static void check_events(){ |
113 int e=vo_x11_check_events(mDisplay); | |
1 | 114 } |
115 | |
767
372042df5c77
Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents:
616
diff
changeset
|
116 static uint32_t init( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d_height,uint32_t flags,char *title,uint32_t format ) |
1 | 117 { |
118 int screen; | |
767
372042df5c77
Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents:
616
diff
changeset
|
119 int fullscreen=0; |
322
4e69a8e2700a
Screensaver and monitor powersafe function is switched off when playing a
laaz
parents:
303
diff
changeset
|
120 int interval, prefer_blank, allow_exp, nothing; |
1 | 121 unsigned int fg,bg; |
122 char *hello=( title == NULL ) ? "X11 render" : title; | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
865
diff
changeset
|
123 // char *name=":0.0"; |
1 | 124 XSizeHints hint; |
125 XVisualInfo vinfo; | |
126 XEvent xev; | |
127 XGCValues xgcv; | |
128 Colormap theCmap; | |
129 XSetWindowAttributes xswa; | |
130 unsigned long xswamask; | |
131 | |
132 image_height=height; | |
133 image_width=width; | |
134 image_format=format; | |
135 | |
136 if ( X_already_started ) return -1; | |
137 if( !vo_init() ) return 0; // Can't open X11 | |
138 | |
139 hint.x=0; | |
140 hint.y=0; | |
141 hint.width=image_width; | |
142 hint.height=image_height; | |
767
372042df5c77
Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents:
616
diff
changeset
|
143 |
372042df5c77
Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents:
616
diff
changeset
|
144 if( flags&0x01 ) fullscreen = 1; |
372042df5c77
Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents:
616
diff
changeset
|
145 if( flags&0x08 ) Flip_Flag = 1; |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
146 |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
147 #ifdef HAVE_XF86VM |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
148 if (fullscreen) { |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
149 unsigned int modeline_width, modeline_height, vm_event, vm_error; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
150 unsigned int vm_ver, vm_rev; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
151 int i,j,k,have_vm=0,X,Y; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
152 |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
153 int modecount; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
154 |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
155 if (XF86VidModeQueryExtension(mDisplay, &vm_event, &vm_error)) { |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
156 XF86VidModeQueryVersion(mDisplay, &vm_ver, &vm_rev); |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
157 printf("XF86VidMode Extension v%i.%i\n", vm_ver, vm_rev); |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
158 have_vm=1; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
159 } else |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
160 printf("XF86VidMode Extenstion not available.\n"); |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
161 |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
162 if (have_vm) { |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
163 if (vidmodes==NULL) |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
865
diff
changeset
|
164 XF86VidModeGetAllModeLines(mDisplay,mScreen,&modecount,&vidmodes); |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
165 j=0; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
166 modeline_width=vidmodes[0]->hdisplay; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
167 modeline_height=vidmodes[0]->vdisplay; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
168 if ((d_width==0) && (d_height==0)) |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
169 { X=image_width; Y=image_height; } |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
170 else |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
171 { X=d_width; Y=d_height; } |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
172 |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
173 for (i=1; i<modecount; i++) |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
174 if ((vidmodes[i]->hdisplay >= X) && (vidmodes[i]->vdisplay >= Y)) |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
175 if ( (vidmodes[i]->hdisplay < modeline_width ) && (vidmodes[i]->vdisplay < modeline_height) ) |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
176 { |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
177 modeline_width=vidmodes[i]->hdisplay; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
178 modeline_height=vidmodes[i]->vdisplay; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
179 j=i; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
180 } |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
181 |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
182 printf("XF86VM: Selected video mode %dx%d for image size %dx%d.\n",modeline_width, modeline_height, image_width, image_height); |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
865
diff
changeset
|
183 XF86VidModeLockModeSwitch(mDisplay,mScreen,0); |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
865
diff
changeset
|
184 XF86VidModeSwitchToMode(mDisplay,mScreen,vidmodes[j]); |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
865
diff
changeset
|
185 XF86VidModeSwitchToMode(mDisplay,mScreen,vidmodes[j]); |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
186 X=(vo_screenwidth-modeline_width)/2; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
187 Y=(vo_screenheight-modeline_height)/2; |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
865
diff
changeset
|
188 XF86VidModeSetViewPort(mDisplay,mScreen,X,Y); |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
189 } |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
190 } |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
191 #endif |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
192 |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
193 |
1 | 194 if ( fullscreen ) |
195 { | |
196 hint.width=vo_screenwidth; | |
197 hint.height=vo_screenheight; | |
198 } | |
31 | 199 vo_dwidth=hint.width; |
200 vo_dheight=hint.height; | |
1 | 201 hint.flags=PPosition | PSize; |
202 | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
865
diff
changeset
|
203 bg=WhitePixel( mDisplay,mScreen ); |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
865
diff
changeset
|
204 fg=BlackPixel( mDisplay,mScreen ); |
1 | 205 |
206 XGetWindowAttributes( mDisplay,DefaultRootWindow( mDisplay ),&attribs ); | |
207 depth=attribs.depth; | |
208 | |
209 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:
865
diff
changeset
|
210 XMatchVisualInfo( mDisplay,mScreen,depth,TrueColor,&vinfo ); |
1 | 211 |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
865
diff
changeset
|
212 theCmap =XCreateColormap( mDisplay,RootWindow( mDisplay,mScreen ), |
1 | 213 vinfo.visual,AllocNone ); |
214 | |
215 xswa.background_pixel=0; | |
216 xswa.border_pixel=1; | |
217 xswa.colormap=theCmap; | |
218 xswamask=CWBackPixel | CWBorderPixel |CWColormap; | |
219 | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
865
diff
changeset
|
220 mywindow=XCreateWindow( mDisplay,RootWindow( mDisplay,mScreen ), |
1 | 221 hint.x,hint.y, |
222 hint.width,hint.height, | |
223 xswa.border_pixel,depth,CopyFromParent,vinfo.visual,xswamask,&xswa ); | |
384 | 224 vo_hidecursor(mDisplay,mywindow); |
1 | 225 |
31 | 226 if ( fullscreen ) vo_x11_decoration( mDisplay,mywindow,0 ); |
1 | 227 XSelectInput( mDisplay,mywindow,StructureNotifyMask ); |
228 XSetStandardProperties( mDisplay,mywindow,hello,hello,None,NULL,0,&hint ); | |
229 XMapWindow( mDisplay,mywindow ); | |
230 do { XNextEvent( mDisplay,&xev ); } while ( xev.type != MapNotify || xev.xmap.event != mywindow ); | |
231 | |
232 XSelectInput( mDisplay,mywindow,NoEventMask ); | |
233 | |
234 XFlush( mDisplay ); | |
235 XSync( mDisplay,False ); | |
236 | |
237 mygc=XCreateGC( mDisplay,mywindow,0L,&xgcv ); | |
238 | |
239 #ifdef SH_MEM | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
865
diff
changeset
|
240 if ( mLocalDisplay && XShmQueryExtension( mDisplay ) ) Shmem_Flag=1; |
1 | 241 else |
242 { | |
243 Shmem_Flag=0; | |
614 | 244 if ( !Quiet_Flag ) printf( "Shared memory not supported\nReverting to normal Xlib\n" ); |
1 | 245 } |
246 if ( Shmem_Flag ) CompletionType=XShmGetEventBase( mDisplay ) + ShmCompletion; | |
247 | |
248 InstallXErrorHandler(); | |
249 | |
250 if ( Shmem_Flag ) | |
251 { | |
252 myximage=XShmCreateImage( mDisplay,vinfo.visual,depth,ZPixmap,NULL,&Shminfo[0],width,image_height ); | |
253 if ( myximage == NULL ) | |
254 { | |
255 if ( myximage != NULL ) XDestroyImage( myximage ); | |
614 | 256 if ( !Quiet_Flag ) printf( "Shared memory error,disabling ( Ximage error )\n" ); |
1 | 257 goto shmemerror; |
258 } | |
259 Shminfo[0].shmid=shmget( IPC_PRIVATE, | |
260 myximage->bytes_per_line * myximage->height , | |
261 IPC_CREAT | 0777 ); | |
262 if ( Shminfo[0].shmid < 0 ) | |
263 { | |
264 XDestroyImage( myximage ); | |
265 if ( !Quiet_Flag ) | |
266 { | |
267 printf( "%s\n",strerror( errno ) ); | |
268 perror( strerror( errno ) ); | |
614 | 269 printf( "Shared memory error,disabling ( seg id error )\n" ); |
1 | 270 } |
271 goto shmemerror; | |
272 } | |
273 Shminfo[0].shmaddr=( char * ) shmat( Shminfo[0].shmid,0,0 ); | |
274 | |
275 if ( Shminfo[0].shmaddr == ( ( char * ) -1 ) ) | |
276 { | |
277 XDestroyImage( myximage ); | |
278 if ( Shminfo[0].shmaddr != ( ( char * ) -1 ) ) shmdt( Shminfo[0].shmaddr ); | |
614 | 279 if ( !Quiet_Flag ) printf( "Shared memory error,disabling ( address error )\n" ); |
1 | 280 goto shmemerror; |
281 } | |
282 myximage->data=Shminfo[0].shmaddr; | |
283 ImageData=( unsigned char * ) myximage->data; | |
284 Shminfo[0].readOnly=False; | |
285 XShmAttach( mDisplay,&Shminfo[0] ); | |
286 | |
287 XSync( mDisplay,False ); | |
288 | |
289 if ( gXErrorFlag ) | |
290 { | |
291 XDestroyImage( myximage ); | |
292 shmdt( Shminfo[0].shmaddr ); | |
614 | 293 if ( !Quiet_Flag ) printf( "Shared memory error,disabling.\n" ); |
1 | 294 gXErrorFlag=0; |
295 goto shmemerror; | |
296 } | |
297 else | |
298 shmctl( Shminfo[0].shmid,IPC_RMID,0 ); | |
299 | |
614 | 300 if ( !Quiet_Flag ) printf( "Sharing memory.\n" ); |
1 | 301 } |
302 else | |
303 { | |
304 shmemerror: | |
305 Shmem_Flag=0; | |
306 #endif | |
307 myximage=XGetImage( mDisplay,mywindow,0,0, | |
308 width,image_height,AllPlanes,ZPixmap ); | |
309 ImageData=myximage->data; | |
310 #ifdef SH_MEM | |
311 } | |
312 | |
313 DeInstallXErrorHandler(); | |
314 #endif | |
315 | |
316 bpp=myximage->bits_per_pixel; | |
317 | |
614 | 318 printf( "X11 color mask: R:%lX G:%lX B:%lX\n",myximage->red_mask,myximage->green_mask,myximage->blue_mask ); |
1 | 319 |
320 // If we have blue in the lowest bit then obviously RGB | |
321 mode=( ( myximage->blue_mask & 0x01 ) != 0 ) ? MODE_RGB : MODE_BGR; | |
322 #ifdef WORDS_BIGENDIAN | |
323 if ( myximage->byte_order != MSBFirst ) | |
324 #else | |
325 if ( myximage->byte_order != LSBFirst ) | |
326 #endif | |
327 { | |
614 | 328 printf( "No support fon non-native XImage byte order!\n" ); |
1 | 329 return -1; |
330 } | |
331 | |
332 if( format==IMGFMT_YV12 ) yuv2rgb_init( ( depth == 24 ) ? bpp : depth,mode ); | |
333 | |
334 XSelectInput( mDisplay,mywindow,StructureNotifyMask | KeyPressMask ); | |
335 X_already_started++; | |
336 | |
337 // vo_initthread( mThread ); | |
338 | |
324 | 339 saver_off(mDisplay); |
1 | 340 return 0; |
341 } | |
342 | |
343 static const vo_info_t* get_info( void ) | |
344 { return &vo_info; } | |
345 | |
346 static void Terminate_Display_Process( void ) | |
347 { | |
348 getchar(); /* wait for enter to remove window */ | |
349 #ifdef SH_MEM | |
350 if ( Shmem_Flag ) | |
351 { | |
352 XShmDetach( mDisplay,&Shminfo[0] ); | |
353 XDestroyImage( myximage ); | |
354 shmdt( Shminfo[0].shmaddr ); | |
355 } | |
356 #endif | |
357 XDestroyWindow( mDisplay,mywindow ); | |
358 XCloseDisplay( mDisplay ); | |
359 X_already_started=0; | |
360 } | |
361 | |
362 static void Display_Image( XImage *myximage,uint8_t *ImageData ) | |
363 { | |
364 #ifdef DISP | |
365 #ifdef SH_MEM | |
366 if ( Shmem_Flag ) | |
367 { | |
368 XShmPutImage( mDisplay,mywindow,mygc,myximage, | |
369 0,0, | |
31 | 370 ( vo_dwidth - myximage->width ) / 2,( vo_dheight - myximage->height ) / 2, |
1 | 371 myximage->width,myximage->height,True ); |
372 XFlush( mDisplay ); | |
373 } | |
374 else | |
375 #endif | |
376 { | |
377 XPutImage( mDisplay,mywindow,mygc,myximage, | |
378 0,0, | |
31 | 379 ( vo_dwidth - myximage->width ) / 2,( vo_dheight - myximage->height ) / 2, |
1 | 380 myximage->width,myximage->height ); |
381 XFlush( mDisplay ); | |
382 } | |
383 #endif | |
384 } | |
385 | |
202 | 386 static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ |
326 | 387 switch(bpp){ |
388 case 24: | |
389 vo_draw_alpha_rgb24(w,h,src,srca,stride,ImageData+3*(y0*image_width+x0),3*image_width); | |
390 break; | |
391 case 32: | |
392 vo_draw_alpha_rgb32(w,h,src,srca,stride,ImageData+4*(y0*image_width+x0),4*image_width); | |
393 break; | |
394 case 15: | |
395 case 16: | |
396 if(depth==15) | |
397 vo_draw_alpha_rgb15(w,h,src,srca,stride,ImageData+2*(y0*image_width+x0),2*image_width); | |
398 else | |
399 vo_draw_alpha_rgb16(w,h,src,srca,stride,ImageData+2*(y0*image_width+x0),2*image_width); | |
400 break; | |
202 | 401 } |
402 } | |
403 | |
31 | 404 static void flip_page( void ){ |
213 | 405 vo_draw_text(image_width,image_height,draw_alpha); |
31 | 406 check_events(); |
407 Display_Image( myximage,ImageData ); | |
408 } | |
1 | 409 |
410 static uint32_t draw_slice( uint8_t *src[],int stride[],int w,int h,int x,int y ) | |
411 { | |
412 uint8_t *dst; | |
413 | |
414 dst=ImageData + ( image_width * y + x ) * ( bpp/8 ); | |
415 yuv2rgb( dst,src[0],src[1],src[2],w,h,image_width*( bpp/8 ),stride[0],stride[1] ); | |
416 return 0; | |
417 } | |
418 | |
419 void rgb15to16_mmx( char* s0,char* d0,int count ); | |
420 | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
421 static uint32_t draw_frame( uint8_t *src[] ){ |
767
372042df5c77
Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents:
616
diff
changeset
|
422 int i; |
1 | 423 int sbpp=( ( image_format&0xFF )+7 )/8; |
424 int dbpp=( bpp+7 )/8; | |
425 char *d=ImageData; | |
426 char *s=src[0]; | |
427 //printf( "sbpp=%d dbpp=%d depth=%d bpp=%d\n",sbpp,dbpp,depth,bpp ); | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
428 |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
429 if( Flip_Flag ){ |
1 | 430 // flipped BGR |
431 int i; | |
432 //printf( "Rendering flipped BGR frame bpp=%d src=%d dst=%d\n",bpp,sbpp,dbpp ); | |
433 s+=sbpp*image_width*image_height; | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
434 for( i=0;i<image_height;i++ ) { |
1 | 435 s-=sbpp*image_width; |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
436 if( sbpp==dbpp ) { |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
437 if( depth==16 && image_format==( IMGFMT_BGR|15 ) ){ |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
438 |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
439 // do 15bpp->16bpp |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
440 #ifdef HAVE_MMX |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
441 rgb15to16_mmx( s,d,2*image_width ); |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
442 #else |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
443 unsigned short *s1=( unsigned short * )s; |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
444 unsigned short *d1=( unsigned short * )d; |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
445 unsigned short *e=s1+image_width; |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
446 while( s1<e ){ |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
447 register int x=*( s1++ ); |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
448 // rrrrrggggggbbbbb |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
449 // 0rrrrrgggggbbbbb |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
450 // 0111 1111 1110 0000=0x7FE0 |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
451 // 00000000000001 1111=0x001F |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
452 *( d1++ )=( x&0x001F )|( ( x&0x7FE0 )<<1 ); |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
453 } |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
454 #endif |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
455 |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
456 } else |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
457 memcpy( d,s,sbpp*image_width ); |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
458 } else { |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
459 // sbpp!=dbpp |
1 | 460 char *s2=s; |
461 char *d2=d; | |
462 char *e=s2+sbpp*image_width; | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
463 while( s2<e ) { |
1 | 464 d2[0]=s2[0]; |
465 d2[1]=s2[1]; | |
466 d2[2]=s2[2]; | |
467 s2+=sbpp;d2+=dbpp; | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
468 } |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
469 } |
1 | 470 d+=dbpp*image_width; |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
471 } |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
472 } else { |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
473 if( sbpp==dbpp ) { |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
474 if( depth==16 && image_format==( IMGFMT_BGR|15 ) ){ |
1 | 475 // do 15bpp->16bpp |
476 #ifdef HAVE_MMX | |
477 rgb15to16_mmx( s,d,2*image_width*image_height ); | |
478 #else | |
479 unsigned short *s1=( unsigned short * )s; | |
480 unsigned short *d1=( unsigned short * )d; | |
481 unsigned short *e=s1+image_width*image_height; | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
482 while( s1<e ){ |
1 | 483 register int x=*( s1++ ); |
484 // rrrrrggggggbbbbb | |
485 // 0rrrrrgggggbbbbb | |
486 // 0111 1111 1110 0000=0x7FE0 | |
487 // 00000000000001 1111=0x001F | |
488 *( d1++ )=( x&0x001F )|( ( x&0x7FE0 )<<1 ); | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
489 } |
1 | 490 #endif |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
491 } else |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
492 memcpy( d,s,sbpp*image_width*image_height ); |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
493 } else { |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
494 // sbpp!=dbpp |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
495 char *e=s+sbpp*image_width*image_height; |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
496 //printf( "libvo: using C 24->32bpp conversion\n" ); |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
497 while( s<e ){ |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
498 d[0]=s[0]; |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
499 d[1]=s[1]; |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
500 d[2]=s[2]; |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
501 s+=sbpp;d+=dbpp; |
1 | 502 } |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
503 } |
1 | 504 } |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
505 return 0; |
1 | 506 } |
507 | |
508 static uint32_t query_format( uint32_t format ) | |
509 { | |
510 if( !vo_init() ) return 0; // Can't open X11 | |
325 | 511 |
512 if( ( format&IMGFMT_BGR_MASK )==IMGFMT_BGR ){ | |
513 int bpp=format&0xFF; | |
514 if( bpp==vo_depthonscreen ) return 1; | |
515 if( bpp==15 && vo_depthonscreen==16) return 1; // built-in conversion | |
516 if( bpp==24 && vo_depthonscreen==32) return 1; // built-in conversion | |
517 } | |
518 | |
1 | 519 switch( format ) |
324 | 520 { |
1 | 521 case IMGFMT_YV12: return 1; |
324 | 522 } |
1 | 523 return 0; |
524 } | |
525 | |
526 | |
527 static void | |
528 uninit(void) | |
529 { | |
324 | 530 saver_on(mDisplay); // screen saver back on |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
531 #ifdef HAVE_XF86VM |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
532 if (vidmodes!=NULL) |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
533 { |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
534 int screen; screen=DefaultScreen( mDisplay ); |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
535 XF86VidModeSwitchToMode(mDisplay,screen,vidmodes[0]); |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
536 XF86VidModeSwitchToMode(mDisplay,screen,vidmodes[0]); |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
537 free(vidmodes); |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
538 } |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
539 #endif |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
540 |
1 | 541 printf("vo: uninit!\n"); |
542 } | |
543 | |
544 | |
545 |