annotate libvo/vo_x11.c @ 4717:b7054dadd2c0

We should skip exactly the first frame on mp3 files. Should correct many badly detected file, decoder crash, etc
author albeu
date Fri, 15 Feb 2002 16:48:25 +0000
parents b4f72d6b2365
children c70b0c4b85f5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1 #define DISP
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3 /*
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
4 * video_out_x11.c,X11 interface
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
5 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
6 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
7 * Copyright ( C ) 1996,MPEG Software Simulation Group. All Rights Reserved.
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
8 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
9 * Hacked into mpeg2dec by
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
10 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
11 * Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
12 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
13 * 15 & 16 bpp support added by Franck Sicard <Franck.Sicard@solsoft.fr>
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
14 * use swScaler instead of lots of tricky converters by Michael Niedermayer <michaelni@gmx.at>
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
15 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
16 */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
17
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
18 #include <stdio.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
19 #include <stdlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
20 #include <string.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
21 #include <signal.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
22
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
23 #include "config.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
24 #include "video_out.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
25 #include "video_out_internal.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
26
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
27 LIBVO_EXTERN( x11 )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
28
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
29 #include <X11/Xlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
30 #include <X11/Xutil.h>
4036
76ea6f97ebb7 added rgb24to32 instead of c converter
alex
parents: 4017
diff changeset
31
206
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
32 #ifdef HAVE_XF86VM
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
33 #include <X11/extensions/xf86vmode.h>
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
34 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
35 #include <errno.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
36
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
37 #include "x11_common.h"
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
38
354
7de9e48c83a5 memcpy() moved mmx.h -> fastmemcpy.h
arpi_esp
parents: 350
diff changeset
39 #include "fastmemcpy.h"
616
41d6eec69b60 clean up
pontscho
parents: 614
diff changeset
40 #include "sub.h"
350
601822cc8c52 applied MMX2 memcpy() patch by Nick Kurshev
arpi_esp
parents: 326
diff changeset
41
2218
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
42 #include "../postproc/swscale.h"
2556
71934dc06490 Using new stuff of rgb15to16
nick
parents: 2519
diff changeset
43 #include "../postproc/rgb2rgb.h"
2218
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
44
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
45 static vo_info_t vo_info =
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
46 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
47 "X11 ( XImage/Shm )",
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
48 "x11",
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
49 "Aaron Holtzman <aholtzma@ess.engr.uvic.ca>",
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
50 ""
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
51 };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
52
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
53 /* private prototypes */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
54 static void Display_Image ( XImage * myximage,unsigned char *ImageData );
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
55 static void (*draw_alpha_fnc)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
56
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
57 /* since it doesn't seem to be defined on some platforms */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
58 int XShmGetEventBase( Display* );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
59
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
60 /* local data */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
61 static unsigned char *ImageData;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
62
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
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
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
65 static Window mywindow;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
66 static GC mygc;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
67 static XImage *myximage;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
68 static int depth,bpp,mode;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
69 static XWindowAttributes attribs;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
70
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
71 //static int vo_dwidth,vo_dheight;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
72
2969
291f45785de9 fix to compile when SHM is disabled
alex
parents: 2732
diff changeset
73 static int Flip_Flag;
4661
4df2400b0527 -fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents: 4658
diff changeset
74 static int zoomFlag;
2969
291f45785de9 fix to compile when SHM is disabled
alex
parents: 2732
diff changeset
75
3003
16a593a1e6ed changed SH_MEM to HAVE_SHM according to configure
alex
parents: 2969
diff changeset
76 #ifdef HAVE_SHM
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
77
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
78 #include <sys/ipc.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
79 #include <sys/shm.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
80 #include <X11/extensions/XShm.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
81
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
82 //static int HandleXError _ANSI_ARGS_( ( Display * dpy,XErrorEvent * event ) );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
83 static void InstallXErrorHandler ( void );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
84 static void DeInstallXErrorHandler ( void );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
85
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
86 static int Shmem_Flag;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
87 static int Quiet_Flag;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
88 static XShmSegmentInfo Shminfo[1];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
89 static int gXErrorFlag;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
90 static int CompletionType=-1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
91
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
92 static void InstallXErrorHandler()
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
93 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
94 //XSetErrorHandler( HandleXError );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
95 XFlush( mDisplay );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
96 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
97
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
98 static void DeInstallXErrorHandler()
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
99 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
100 XSetErrorHandler( NULL );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
101 XFlush( mDisplay );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
102 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
103
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
104 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
105
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
106 static uint32_t image_width;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
107 static uint32_t image_height;
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
108 static uint32_t in_format;
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
109 static uint32_t out_format=0;
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
110 static int aspect; // 1<<16 based fixed point aspect, so that the aspect stays correct during resizing
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
111
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
112 static void check_events(){
1110
71b8911ec3da -Wall like cleanup
al3x
parents: 922
diff changeset
113 vo_x11_check_events(mDisplay);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
114 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
115
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
116 static void draw_alpha_32(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
117 vo_draw_alpha_rgb32(w,h,src,srca,stride,ImageData+4*(y0*image_width+x0),4*image_width);
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
118 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
119
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
120 static void draw_alpha_24(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
121 vo_draw_alpha_rgb24(w,h,src,srca,stride,ImageData+3*(y0*image_width+x0),3*image_width);
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
122 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
123
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
124 static void draw_alpha_16(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
125 vo_draw_alpha_rgb16(w,h,src,srca,stride,ImageData+2*(y0*image_width+x0),2*image_width);
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
126 }
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 static void draw_alpha_15(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
129 vo_draw_alpha_rgb15(w,h,src,srca,stride,ImageData+2*(y0*image_width+x0),2*image_width);
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
130 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
131
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
132 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
133 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
134
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
135 static SwsContext *swsContext=NULL;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
136 extern int sws_flags;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
137
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
138 static XVisualInfo vinfo;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
139
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
140 static void getMyXImage()
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
141 {
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
142 #ifdef HAVE_SHM
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
143 if ( mLocalDisplay && XShmQueryExtension( mDisplay ) ) Shmem_Flag=1;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
144 else
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
145 {
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
146 Shmem_Flag=0;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
147 if ( !Quiet_Flag ) printf( "Shared memory not supported\nReverting to normal Xlib\n" );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
148 }
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
149 if ( Shmem_Flag ) CompletionType=XShmGetEventBase( mDisplay ) + ShmCompletion;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
150
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
151 InstallXErrorHandler();
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
152
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
153 if ( Shmem_Flag )
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
154 {
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
155 myximage=XShmCreateImage( mDisplay,vinfo.visual,depth,ZPixmap,NULL,&Shminfo[0],image_width,image_height );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
156 if ( myximage == NULL )
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
157 {
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
158 if ( myximage != NULL ) XDestroyImage( myximage );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
159 if ( !Quiet_Flag ) printf( "Shared memory error,disabling ( Ximage error )\n" );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
160 goto shmemerror;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
161 }
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
162 Shminfo[0].shmid=shmget( IPC_PRIVATE,
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
163 myximage->bytes_per_line * myximage->height ,
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
164 IPC_CREAT | 0777 );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
165 if ( Shminfo[0].shmid < 0 )
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
166 {
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
167 XDestroyImage( myximage );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
168 if ( !Quiet_Flag )
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
169 {
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
170 printf( "%s\n",strerror( errno ) );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
171 perror( strerror( errno ) );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
172 printf( "Shared memory error,disabling ( seg id error )\n" );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
173 }
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
174 goto shmemerror;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
175 }
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
176 Shminfo[0].shmaddr=( char * ) shmat( Shminfo[0].shmid,0,0 );
3209
0b172eb639f1 swscaler cleanup
michael
parents: 3003
diff changeset
177
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
178 if ( Shminfo[0].shmaddr == ( ( char * ) -1 ) )
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
179 {
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
180 XDestroyImage( myximage );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
181 if ( Shminfo[0].shmaddr != ( ( char * ) -1 ) ) shmdt( Shminfo[0].shmaddr );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
182 if ( !Quiet_Flag ) printf( "Shared memory error,disabling ( address error )\n" );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
183 goto shmemerror;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
184 }
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
185 myximage->data=Shminfo[0].shmaddr;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
186 ImageData=( unsigned char * ) myximage->data;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
187 Shminfo[0].readOnly=False;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
188 XShmAttach( mDisplay,&Shminfo[0] );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
189
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
190 XSync( mDisplay,False );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
191
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
192 if ( gXErrorFlag )
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
193 {
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
194 XDestroyImage( myximage );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
195 shmdt( Shminfo[0].shmaddr );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
196 if ( !Quiet_Flag ) printf( "Shared memory error,disabling.\n" );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
197 gXErrorFlag=0;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
198 goto shmemerror;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
199 }
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
200 else
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
201 shmctl( Shminfo[0].shmid,IPC_RMID,0 );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
202
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
203 {
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
204 static int firstTime=1;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
205 if ( !Quiet_Flag && firstTime){
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
206 printf( "Sharing memory.\n" );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
207 firstTime=0;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
208 }
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
209 }
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
210 }
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
211 else
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
212 {
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
213 shmemerror:
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
214 Shmem_Flag=0;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
215 #endif
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
216 myximage=XGetImage( mDisplay,mywindow,0,0,
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
217 image_width,image_height,AllPlanes,ZPixmap );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
218 ImageData=myximage->data;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
219 #ifdef HAVE_SHM
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
220 }
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
221
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
222 DeInstallXErrorHandler();
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
223 #endif
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
224 }
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
225
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
226 static void freeMyXImage()
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
227 {
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
228 #ifdef HAVE_SHM
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
229 if ( Shmem_Flag )
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
230 {
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
231 XShmDetach( mDisplay,&Shminfo[0] );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
232 XDestroyImage( myximage );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
233 shmdt( Shminfo[0].shmaddr );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
234 }
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
235 else
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
236 #endif
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
237 {
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
238 XDestroyImage( myximage );
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
239 }
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
240 }
2218
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
241
4433
df8e0f71cc3c new info for tuning
nick
parents: 4426
diff changeset
242 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
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
243 {
1110
71b8911ec3da -Wall like cleanup
al3x
parents: 922
diff changeset
244 // int screen;
767
372042df5c77 Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents: 616
diff changeset
245 int fullscreen=0;
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1110
diff changeset
246 int vm=0;
1110
71b8911ec3da -Wall like cleanup
al3x
parents: 922
diff changeset
247 // int interval, prefer_blank, allow_exp, nothing;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
248 unsigned int fg,bg;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
249 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
250 // char *name=":0.0";
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
251 XSizeHints hint;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
252 XEvent xev;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
253 XGCValues xgcv;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
254 Colormap theCmap;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
255 XSetWindowAttributes xswa;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
256 unsigned long xswamask;
4426
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
257 #ifdef HAVE_XF86VM
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
258 unsigned int modeline_width, modeline_height;
4426
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
259 static uint32_t vm_width;
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
260 static uint32_t vm_height;
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
261 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
262
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
263 in_format=format;
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
264
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1110
diff changeset
265 if( flags&0x03 ) fullscreen = 1;
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1110
diff changeset
266 if( flags&0x02 ) vm = 1;
767
372042df5c77 Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents: 616
diff changeset
267 if( flags&0x08 ) Flip_Flag = 1;
4661
4df2400b0527 -fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents: 4658
diff changeset
268 zoomFlag = flags&0x04;
4677
305a0c20bde4 default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents: 4662
diff changeset
269 // if(!fullscreen) zoomFlag=1; //it makes no sense to avoid zooming on windowd mode
2218
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
270
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
271 //printf( "w: %d h: %d\n\n",vo_dwidth,vo_dheight );
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
272
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
273 XGetWindowAttributes( mDisplay,DefaultRootWindow( mDisplay ),&attribs );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
274 depth=attribs.depth;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
275
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
276 if ( depth != 15 && depth != 16 && depth != 24 && depth != 32 ) depth=24;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
277 XMatchVisualInfo( mDisplay,mScreen,depth,TrueColor,&vinfo );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
278
4697
b4f72d6b2365 bugfix for width % 2 != 0
michael
parents: 4677
diff changeset
279 /* set image size (which is indeed neither the input nor output size),
b4f72d6b2365 bugfix for width % 2 != 0
michael
parents: 4677
diff changeset
280 if zoom is on it will be changed during draw_slice anyway so we dont dupplicate the aspect code here
b4f72d6b2365 bugfix for width % 2 != 0
michael
parents: 4677
diff changeset
281 */
b4f72d6b2365 bugfix for width % 2 != 0
michael
parents: 4677
diff changeset
282 image_width=(width + 7) & (~7);
4677
305a0c20bde4 default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents: 4662
diff changeset
283 image_height=height;
4661
4df2400b0527 -fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents: 4658
diff changeset
284
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
285 aspect= ((1<<16)*d_width + d_height/2)/d_height;
2218
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
286
1752
39fc6cc71b3b vo_window bug fixed
pontscho
parents: 1746
diff changeset
287 #ifdef HAVE_NEW_GUI
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
288 if ( vo_window != None ) { mywindow=vo_window; mygc=vo_gc; }
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
289 else
1752
39fc6cc71b3b vo_window bug fixed
pontscho
parents: 1746
diff changeset
290 #endif
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
291 {
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
292 if( !vo_init() ) return 0; // Can't open X11
206
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
293
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
294 hint.x=0;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
295 hint.y=0;
4697
b4f72d6b2365 bugfix for width % 2 != 0
michael
parents: 4677
diff changeset
296 if(zoomFlag){
b4f72d6b2365 bugfix for width % 2 != 0
michael
parents: 4677
diff changeset
297 hint.width=d_width;
b4f72d6b2365 bugfix for width % 2 != 0
michael
parents: 4677
diff changeset
298 hint.height=d_height;
b4f72d6b2365 bugfix for width % 2 != 0
michael
parents: 4677
diff changeset
299 }else{
b4f72d6b2365 bugfix for width % 2 != 0
michael
parents: 4677
diff changeset
300 hint.width=width;
b4f72d6b2365 bugfix for width % 2 != 0
michael
parents: 4677
diff changeset
301 hint.height=height;
b4f72d6b2365 bugfix for width % 2 != 0
michael
parents: 4677
diff changeset
302 }
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
303
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
304 #ifdef HAVE_XF86VM
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
305 if ( vm )
4426
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
306 {
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
307 if ((d_width==0) && (d_height==0))
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
308 { vm_width=image_width; vm_height=image_height; }
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
309 else
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
310 { vm_width=d_width; vm_height=d_height; }
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
311 vo_vm_switch(vm_width, vm_height,&modeline_width, &modeline_height);
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
312 hint.x=(vo_screenwidth-modeline_width)/2;
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
313 hint.y=(vo_screenheight-modeline_height)/2;
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
314 hint.width=modeline_width;
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
315 hint.height=modeline_height;
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
316 }
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
317 else
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
318 #endif
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
319 if ( fullscreen )
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
320 {
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
321 hint.width=vo_screenwidth;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
322 hint.height=vo_screenheight;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
323 }
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
324 hint.flags=PPosition | PSize;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
325
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
326 bg=WhitePixel( mDisplay,mScreen );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
327 fg=BlackPixel( mDisplay,mScreen );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
328 vo_dwidth=hint.width;
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
329 vo_dheight=hint.height;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
330
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
331 theCmap =XCreateColormap( mDisplay,RootWindow( mDisplay,mScreen ),
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
332 vinfo.visual,AllocNone );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
333
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
334 xswa.background_pixel=0;
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
335 xswa.border_pixel=0;
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
336 xswa.colormap=theCmap;
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
337 xswamask=CWBackPixel | CWBorderPixel | CWColormap;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
338
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
339 #ifdef HAVE_XF86VM
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
340 if ( vm )
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
341 {
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
342 xswa.override_redirect=True;
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
343 xswamask|=CWOverrideRedirect;
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
344 }
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
345 #endif
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
346
3830
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3655
diff changeset
347 if ( WinID>=0 ){
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3655
diff changeset
348 mywindow = WinID ? ((Window)WinID) : RootWindow( mDisplay,mScreen );
3655
18cca6a6816c Plugger patch by Sam Lin
atmos4
parents: 3458
diff changeset
349 XUnmapWindow( mDisplay,mywindow );
18cca6a6816c Plugger patch by Sam Lin
atmos4
parents: 3458
diff changeset
350 XChangeWindowAttributes( mDisplay,mywindow,xswamask,&xswa );
18cca6a6816c Plugger patch by Sam Lin
atmos4
parents: 3458
diff changeset
351 }
18cca6a6816c Plugger patch by Sam Lin
atmos4
parents: 3458
diff changeset
352 else
18cca6a6816c Plugger patch by Sam Lin
atmos4
parents: 3458
diff changeset
353 mywindow=XCreateWindow( mDisplay,RootWindow( mDisplay,mScreen ),
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
354 hint.x,hint.y,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
355 hint.width,hint.height,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
356 xswa.border_pixel,depth,CopyFromParent,vinfo.visual,xswamask,&xswa );
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
357
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
358 vo_x11_classhint( mDisplay,mywindow,"x11" );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
359 vo_hidecursor(mDisplay,mywindow);
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
360 if ( fullscreen ) vo_x11_decoration( mDisplay,mywindow,0 );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
361 XSelectInput( mDisplay,mywindow,StructureNotifyMask );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
362 XSetStandardProperties( mDisplay,mywindow,hello,hello,None,NULL,0,&hint );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
363 XMapWindow( mDisplay,mywindow );
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3830
diff changeset
364 #ifdef HAVE_XINERAMA
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3830
diff changeset
365 vo_x11_xinerama_move(mDisplay,mywindow);
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3830
diff changeset
366 #endif
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
367 do { XNextEvent( mDisplay,&xev ); } while ( xev.type != MapNotify || xev.xmap.event != mywindow );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
368 XSelectInput( mDisplay,mywindow,NoEventMask );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
369
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
370 XFlush( mDisplay );
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
371 XSync( mDisplay,False );
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
372 mygc=XCreateGC( mDisplay,mywindow,0L,&xgcv );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
373
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
374 #ifdef HAVE_XF86VM
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
375 if ( vm )
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
376 {
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
377 /* Grab the mouse pointer in our window */
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
378 XGrabPointer(mDisplay, mywindow, True, 0,
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
379 GrabModeAsync, GrabModeAsync,
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
380 mywindow, None, CurrentTime);
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
381 XSetInputFocus(mDisplay, mywindow, RevertToNone, CurrentTime);
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
382 }
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
383 #endif
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
384 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
385
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
386 getMyXImage();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
387
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
388 switch ((bpp=myximage->bits_per_pixel)){
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
389 case 24: draw_alpha_fnc=draw_alpha_24;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
390 out_format= IMGFMT_BGR24; break;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
391 case 32: draw_alpha_fnc=draw_alpha_32;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
392 out_format= IMGFMT_BGR32; break;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
393 case 15:
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
394 case 16: if (depth==15){
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
395 draw_alpha_fnc=draw_alpha_15;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
396 out_format= IMGFMT_BGR15;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
397 }else{
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
398 draw_alpha_fnc=draw_alpha_16;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
399 out_format= IMGFMT_BGR16;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
400 }break;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
401 default: draw_alpha_fnc=draw_alpha_null;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
402 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
403
4697
b4f72d6b2365 bugfix for width % 2 != 0
michael
parents: 4677
diff changeset
404 /* no scaling here, it will be changed during draw_slice if -zoom is on so we dont dupplicate the code */
b4f72d6b2365 bugfix for width % 2 != 0
michael
parents: 4677
diff changeset
405 swsContext= getSwsContextFromCmdLine(width, height, in_format, width, height, out_format );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
406
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1110
diff changeset
407 // printf( "X11 color mask: R:%lX G:%lX B:%lX\n",myximage->red_mask,myximage->green_mask,myximage->blue_mask );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
408
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
409 // If we have blue in the lowest bit then obviously RGB
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
410 mode=( ( myximage->blue_mask & 0x01 ) != 0 ) ? MODE_RGB : MODE_BGR;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
411 #ifdef WORDS_BIGENDIAN
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
412 if ( myximage->byte_order != MSBFirst )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
413 #else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
414 if ( myximage->byte_order != LSBFirst )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
415 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
416 {
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1110
diff changeset
417 mode=( ( myximage->blue_mask & 0x01 ) != 0 ) ? MODE_BGR : MODE_RGB;
4382
2f540642e44d small typos in text
pl
parents: 4352
diff changeset
418 // printf( "No support for non-native XImage byte order!\n" );
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1110
diff changeset
419 // return -1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
420 }
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
421
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
422 if(mode==MODE_BGR)
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
423 {
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
424 printf("hmm, arpi said that isnt used, contact the developers, thats weird\n" );
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
425 return -1;
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
426 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
427
1758
c0aba1ddd7be fix vo_window again
pontscho
parents: 1752
diff changeset
428 #ifdef HAVE_NEW_GUI
c0aba1ddd7be fix vo_window again
pontscho
parents: 1752
diff changeset
429 if ( vo_window == None )
c0aba1ddd7be fix vo_window again
pontscho
parents: 1752
diff changeset
430 #endif
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1758
diff changeset
431 {
4658
93d562ad1c22 Added new input mouse support in x11 vo
albeu
parents: 4641
diff changeset
432 XSelectInput( mDisplay,mywindow,StructureNotifyMask | KeyPressMask
93d562ad1c22 Added new input mouse support in x11 vo
albeu
parents: 4641
diff changeset
433 #ifdef HAVE_NEW_INPUT
93d562ad1c22 Added new input mouse support in x11 vo
albeu
parents: 4641
diff changeset
434 | ButtonPressMask | ButtonReleaseMask
93d562ad1c22 Added new input mouse support in x11 vo
albeu
parents: 4641
diff changeset
435 #endif
93d562ad1c22 Added new input mouse support in x11 vo
albeu
parents: 4641
diff changeset
436 );
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1758
diff changeset
437 }
4316
9f8a618e87c3 fix screen saver bug under gui
pontscho
parents: 4036
diff changeset
438 saver_off(mDisplay);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
439 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
440 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
441
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
442 static const vo_info_t* get_info( void )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
443 { return &vo_info; }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
444
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
445 static void Display_Image( XImage *myximage,uint8_t *ImageData )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
446 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
447 #ifdef DISP
3003
16a593a1e6ed changed SH_MEM to HAVE_SHM according to configure
alex
parents: 2969
diff changeset
448 #ifdef HAVE_SHM
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
449 if ( Shmem_Flag )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
450 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
451 XShmPutImage( mDisplay,mywindow,mygc,myximage,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
452 0,0,
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
453 ( vo_dwidth - swsContext->dstW ) / 2,( vo_dheight - myximage->height ) / 2,
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
454 swsContext->dstW,myximage->height,True );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
455 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
456 else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
457 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
458 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
459 XPutImage( mDisplay,mywindow,mygc,myximage,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
460 0,0,
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
461 ( vo_dwidth - swsContext->dstW ) / 2,( vo_dheight - myximage->height ) / 2,
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
462 swsContext->dstW,myximage->height);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
463 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
464 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
465 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
466
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1137
diff changeset
467 static void draw_osd(void)
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
468 { vo_draw_text(image_width,image_height,draw_alpha_fnc); }
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1137
diff changeset
469
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
470 static void flip_page( void ){
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
471 Display_Image( myximage,ImageData );
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1137
diff changeset
472 XSync(mDisplay, False);
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
473 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
474
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
475 static uint32_t draw_slice( uint8_t *src[],int stride[],int w,int h,int x,int y )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
476 {
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
477 uint8_t *dst[3];
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
478 int dstStride[3];
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
479 static int old_vo_dwidth=-1;
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
480 static int old_vo_dheight=-1;
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
481
4661
4df2400b0527 -fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents: 4658
diff changeset
482 if((old_vo_dwidth != vo_dwidth || old_vo_dheight != vo_dheight) && y==0 && zoomFlag)
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
483 {
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
484 int newW= vo_dwidth;
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
485 int newH= vo_dheight;
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
486 int newAspect= (newW*(1<<16) + (newH>>1))/newH;
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
487 SwsContext *oldContext= swsContext;
4340
8a6f0b482acb added support for i420 and iyuv
alex
parents: 4316
diff changeset
488
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
489 if(newAspect>aspect) newW= (newH*aspect + (1<<15))>>16;
4662
90cf53f47ab7 minor rounding bugfix in the aspect stuff
michael
parents: 4661
diff changeset
490 else newH= ((newW<<16) + (aspect>>1)) /aspect;
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
491
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
492 old_vo_dwidth= vo_dwidth;
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
493 old_vo_dheight= vo_dheight;
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
494
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
495 if(sws_flags==0) newW&= (~31); // not needed but, if the user wants the FAST_BILINEAR SCALER, then its needed
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
496
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
497 swsContext= getSwsContextFromCmdLine(oldContext->srcW, oldContext->srcH, in_format,
4541
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
498 newW, newH, out_format);
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
499 if(swsContext)
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
500 {
4627
3db7ee2ac7b0 bgr15 / bgr16 input support (with -zoom)
michael
parents: 4596
diff changeset
501 image_width= (newW+7)&(~7);
4541
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
502 image_height= newH;
4627
3db7ee2ac7b0 bgr15 / bgr16 input support (with -zoom)
michael
parents: 4596
diff changeset
503
4541
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
504 freeMyXImage();
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
505 getMyXImage();
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
506 freeSwsContext(oldContext);
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
507 }
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
508 else
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
509 {
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
510 swsContext= oldContext;
fc978c8eff3b checking output of getSwsContext*()
michael
parents: 4512
diff changeset
511 }
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
512 }
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
513 dstStride[1]=
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
514 dstStride[2]=0;
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
515 dst[1]=
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
516 dst[2]=NULL;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
517
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
518 if(Flip_Flag)
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
519 {
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
520 dstStride[0]= -image_width*((bpp+7)/8);
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
521 dst[0]=ImageData - dstStride[0]*(image_height-1);
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
522 swsContext->swScale(swsContext,src,stride,y,h,dst, dstStride);
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
523 }
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
524 else
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
525 {
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
526 dstStride[0]=image_width*((bpp+7)/8);
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
527 dst[0]=ImageData;
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
528 swsContext->swScale(swsContext,src,stride,y,h,dst, dstStride);
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
529 }
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
530 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
531 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
532
775
1cc160d46319 flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents: 767
diff changeset
533 static uint32_t draw_frame( uint8_t *src[] ){
4512
f52e38e03bb7 YUY2 BGR32 BGR24 support for vo_x11 if swScaler is used
michael
parents: 4443
diff changeset
534 int stride[3]= {0,0,0};
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
535
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
536 if (in_format==IMGFMT_YUY2) stride[0]=swsContext->srcW*2;
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
537 else if(in_format==IMGFMT_BGR15) stride[0]=swsContext->srcW*2;
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
538 else if(in_format==IMGFMT_BGR16) stride[0]=swsContext->srcW*2;
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
539 else if(in_format==IMGFMT_BGR24) stride[0]=swsContext->srcW*3;
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
540 else if(in_format==IMGFMT_BGR32) stride[0]=swsContext->srcW*4;
4512
f52e38e03bb7 YUY2 BGR32 BGR24 support for vo_x11 if swScaler is used
michael
parents: 4443
diff changeset
541
f52e38e03bb7 YUY2 BGR32 BGR24 support for vo_x11 if swScaler is used
michael
parents: 4443
diff changeset
542 return draw_slice(src, stride, swsContext->srcW, swsContext->srcH, 0, 0);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
543 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
544
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
545 static uint32_t query_format( uint32_t format )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
546 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
547 if( !vo_init() ) return 0; // Can't open X11
325
b2fd5c172f80 vo_x11 query_format fix
laaz
parents: 324
diff changeset
548
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
549 switch( format )
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 322
diff changeset
550 {
4627
3db7ee2ac7b0 bgr15 / bgr16 input support (with -zoom)
michael
parents: 4596
diff changeset
551 case IMGFMT_BGR15:
3db7ee2ac7b0 bgr15 / bgr16 input support (with -zoom)
michael
parents: 4596
diff changeset
552 case IMGFMT_BGR16:
4512
f52e38e03bb7 YUY2 BGR32 BGR24 support for vo_x11 if swScaler is used
michael
parents: 4443
diff changeset
553 case IMGFMT_BGR24:
f52e38e03bb7 YUY2 BGR32 BGR24 support for vo_x11 if swScaler is used
michael
parents: 4443
diff changeset
554 case IMGFMT_BGR32:
f52e38e03bb7 YUY2 BGR32 BGR24 support for vo_x11 if swScaler is used
michael
parents: 4443
diff changeset
555 case IMGFMT_YUY2:
4340
8a6f0b482acb added support for i420 and iyuv
alex
parents: 4316
diff changeset
556 case IMGFMT_I420:
8a6f0b482acb added support for i420 and iyuv
alex
parents: 4316
diff changeset
557 case IMGFMT_IYUV:
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
558 case IMGFMT_YV12: return 1;
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 322
diff changeset
559 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
560 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
561 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
562
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
563
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
564 static void
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
565 uninit(void)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
566 {
4443
cf62fa252821 removed obsoleted Terminate_Display_Process, using freeMyXImage and vo_x11_uninit at exit
alex
parents: 4433
diff changeset
567 freeMyXImage();
4316
9f8a618e87c3 fix screen saver bug under gui
pontscho
parents: 4036
diff changeset
568 saver_on(mDisplay); // screen saver back on
4426
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
569
206
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
570 #ifdef HAVE_XF86VM
4426
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
571 vo_vm_close(mDisplay);
206
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
572 #endif
4426
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
573
4443
cf62fa252821 removed obsoleted Terminate_Display_Process, using freeMyXImage and vo_x11_uninit at exit
alex
parents: 4433
diff changeset
574 vo_x11_uninit(mDisplay, mywindow);
4677
305a0c20bde4 default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents: 4662
diff changeset
575
305a0c20bde4 default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents: 4662
diff changeset
576 freeSwsContext(swsContext);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
577 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
578
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4340
diff changeset
579 static uint32_t preinit(const char *arg)
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4340
diff changeset
580 {
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4340
diff changeset
581 return 0;
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4340
diff changeset
582 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
583
4596
c35d7ce151b3 10000hl to Holm... control MUST BE static...
arpi
parents: 4592
diff changeset
584 static uint32_t control(uint32_t request, void *data, ...)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4340
diff changeset
585 {
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4554
diff changeset
586 switch (request) {
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4554
diff changeset
587 case VOCTRL_QUERY_FORMAT:
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4554
diff changeset
588 return query_format(*((uint32_t*)data));
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4554
diff changeset
589 }
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4554
diff changeset
590 return VO_NOTIMPL;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4340
diff changeset
591 }