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