Mercurial > mplayer.hg
annotate libvo/vo_x11.c @ 25899:9d4121fa508a
Split osd related stuff from mp_core.h into new header file mp_osd.h.
author | ulion |
---|---|
date | Wed, 30 Jan 2008 07:21:05 +0000 |
parents | f689811209b1 |
children | afa125da85cf |
rev | line source |
---|---|
1 | 1 |
2 #include <stdio.h> | |
3 #include <stdlib.h> | |
4 #include <string.h> | |
5 | |
6 #include "config.h" | |
7 #include "video_out.h" | |
8 #include "video_out_internal.h" | |
9 | |
10 | |
11 #include <X11/Xlib.h> | |
12 #include <X11/Xutil.h> | |
4036 | 13 |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
14 #ifdef HAVE_XF86VM |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
15 #include <X11/extensions/xf86vmode.h> |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
16 #endif |
1 | 17 #include <errno.h> |
18 | |
31 | 19 #include "x11_common.h" |
20 | |
11690
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
21 #ifdef HAVE_SHM |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
22 #include <sys/ipc.h> |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
23 #include <sys/shm.h> |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
24 #include <X11/extensions/XShm.h> |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
25 |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
26 static int Shmem_Flag; |
12582 | 27 |
11690
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
28 //static int Quiet_Flag; Here also what is this for. It's used but isn't inited ? |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
29 static XShmSegmentInfo Shminfo[1]; |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
30 static int gXErrorFlag; |
12582 | 31 static int CompletionType = -1; |
11690
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
32 |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
33 /* since it doesn't seem to be defined on some platforms */ |
12582 | 34 int XShmGetEventBase(Display *); |
11690
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
35 #endif |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
36 |
616 | 37 #include "sub.h" |
350 | 38 |
18861 | 39 #include "libswscale/swscale.h" |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13056
diff
changeset
|
40 #include "libmpcodecs/vf_scale.h" |
18746 | 41 #define MODE_RGB 0x1 |
42 #define MODE_BGR 0x2 | |
2218 | 43 |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13056
diff
changeset
|
44 #include "mp_msg.h" |
18234
a107276371a8
Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents:
18116
diff
changeset
|
45 #include "help_mp.h" |
4734 | 46 |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
47 #ifdef HAVE_NEW_GUI |
23077 | 48 #include "gui/interface.h" |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13056
diff
changeset
|
49 #include "mplayer.h" |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
50 #endif |
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
51 |
25216 | 52 static const vo_info_t info = { |
12582 | 53 "X11 ( XImage/Shm )", |
54 "x11", | |
55 "Aaron Holtzman <aholtzma@ess.engr.uvic.ca>", | |
56 "" | |
1 | 57 }; |
58 | |
25220
c9e9ac2008c2
Mark the vo_functions_t definitions as const where possible.
reimar
parents:
25216
diff
changeset
|
59 const LIBVO_EXTERN(x11) |
1 | 60 /* private prototypes */ |
12582 | 61 static void Display_Image(XImage * myximage, unsigned char *ImageData); |
62 static void (*draw_alpha_fnc) (int x0, int y0, int w, int h, | |
63 unsigned char *src, unsigned char *srca, | |
64 int stride); | |
1 | 65 |
66 /* local data */ | |
67 static unsigned char *ImageData; | |
21585
e54f539c9b5d
Align image data pointer, this is also in preparation of an upcoming patch
reimar
parents:
21584
diff
changeset
|
68 //! original unaligned pointer for free |
e54f539c9b5d
Align image data pointer, this is also in preparation of an upcoming patch
reimar
parents:
21584
diff
changeset
|
69 static unsigned char *ImageDataOrig; |
1 | 70 |
71 /* X11 related variables */ | |
7764 | 72 static XImage *myximage = NULL; |
23381
300e9b7c499f
Remove some unused variables, patch by timwoj ieee org.
diego
parents:
23376
diff
changeset
|
73 static int depth, bpp; |
1 | 74 static XWindowAttributes attribs; |
75 | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
76 static int int_pause; |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
77 |
2969 | 78 static int Flip_Flag; |
4661
4df2400b0527
-fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents:
4658
diff
changeset
|
79 static int zoomFlag; |
2969 | 80 |
1 | 81 |
82 static uint32_t image_width; | |
83 static uint32_t image_height; | |
4641 | 84 static uint32_t in_format; |
12582 | 85 static uint32_t out_format = 0; |
21586
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
86 static int out_offset; |
12582 | 87 static int srcW = -1; |
88 static int srcH = -1; | |
89 static int aspect; // 1<<16 based fixed point aspect, so that the aspect stays correct during resizing | |
1 | 90 |
12582 | 91 static int old_vo_dwidth = -1; |
92 static int old_vo_dheight = -1; | |
93 | |
22886 | 94 static void check_events(void) |
12582 | 95 { |
96 int ret = vo_x11_check_events(mDisplay); | |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
97 |
12582 | 98 /* clear left over borders and redraw frame if we are paused */ |
99 if (ret & VO_EVENT_EXPOSE && int_pause) | |
100 { | |
101 vo_x11_clearwindow_part(mDisplay, vo_window, myximage->width, | |
102 myximage->height, 0); | |
103 flip_page(); | |
104 } else if ((ret & VO_EVENT_RESIZE) || (ret & VO_EVENT_EXPOSE)) | |
105 vo_x11_clearwindow_part(mDisplay, vo_window, myximage->width, | |
106 myximage->height, 0); | |
107 | |
108 } | |
109 | |
110 static void draw_alpha_32(int x0, int y0, int w, int h, unsigned char *src, | |
111 unsigned char *srca, int stride) | |
112 { | |
113 vo_draw_alpha_rgb32(w, h, src, srca, stride, | |
114 ImageData + 4 * (y0 * image_width + x0), | |
115 4 * image_width); | |
1 | 116 } |
117 | |
12582 | 118 static void draw_alpha_24(int x0, int y0, int w, int h, unsigned char *src, |
119 unsigned char *srca, int stride) | |
120 { | |
121 vo_draw_alpha_rgb24(w, h, src, srca, stride, | |
122 ImageData + 3 * (y0 * image_width + x0), | |
123 3 * image_width); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
124 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
125 |
12582 | 126 static void draw_alpha_16(int x0, int y0, int w, int h, unsigned char *src, |
127 unsigned char *srca, int stride) | |
128 { | |
129 vo_draw_alpha_rgb16(w, h, src, srca, stride, | |
130 ImageData + 2 * (y0 * image_width + x0), | |
131 2 * image_width); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
132 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
133 |
12582 | 134 static void draw_alpha_15(int x0, int y0, int w, int h, unsigned char *src, |
135 unsigned char *srca, int stride) | |
136 { | |
137 vo_draw_alpha_rgb15(w, h, src, srca, stride, | |
138 ImageData + 2 * (y0 * image_width + x0), | |
139 2 * image_width); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
140 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
141 |
12582 | 142 static void draw_alpha_null(int x0, int y0, int w, int h, |
143 unsigned char *src, unsigned char *srca, | |
144 int stride) | |
145 { | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
146 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
147 |
18746 | 148 static struct SwsContext *swsContext = NULL; |
149 static int dst_width; | |
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
|
150 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
|
151 |
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 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
|
153 |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
16171
diff
changeset
|
154 static void getMyXImage(void) |
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
|
155 { |
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 #ifdef HAVE_SHM |
12582 | 157 if (mLocalDisplay && XShmQueryExtension(mDisplay)) |
158 Shmem_Flag = 1; | |
159 else | |
160 { | |
161 Shmem_Flag = 0; | |
162 mp_msg(MSGT_VO, MSGL_WARN, | |
163 "Shared memory not supported\nReverting to normal Xlib\n"); | |
164 } | |
165 if (Shmem_Flag) | |
166 CompletionType = XShmGetEventBase(mDisplay) + ShmCompletion; | |
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
|
167 |
12582 | 168 if (Shmem_Flag) |
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
|
169 { |
12582 | 170 myximage = |
171 XShmCreateImage(mDisplay, vinfo.visual, depth, ZPixmap, NULL, | |
172 &Shminfo[0], image_width, image_height); | |
173 if (myximage == NULL) | |
174 { | |
175 mp_msg(MSGT_VO, MSGL_WARN, | |
176 "Shared memory error,disabling ( Ximage error )\n"); | |
177 goto shmemerror; | |
178 } | |
179 Shminfo[0].shmid = shmget(IPC_PRIVATE, | |
180 myximage->bytes_per_line * | |
181 myximage->height, IPC_CREAT | 0777); | |
182 if (Shminfo[0].shmid < 0) | |
183 { | |
184 XDestroyImage(myximage); | |
185 mp_msg(MSGT_VO, MSGL_V, "%s\n", strerror(errno)); | |
186 //perror( strerror( errno ) ); | |
187 mp_msg(MSGT_VO, MSGL_WARN, | |
188 "Shared memory error,disabling ( seg id error )\n"); | |
189 goto shmemerror; | |
190 } | |
191 Shminfo[0].shmaddr = (char *) shmat(Shminfo[0].shmid, 0, 0); | |
3209 | 192 |
12582 | 193 if (Shminfo[0].shmaddr == ((char *) -1)) |
194 { | |
195 XDestroyImage(myximage); | |
196 if (Shminfo[0].shmaddr != ((char *) -1)) | |
197 shmdt(Shminfo[0].shmaddr); | |
198 mp_msg(MSGT_VO, MSGL_WARN, | |
199 "Shared memory error,disabling ( address error )\n"); | |
200 goto shmemerror; | |
201 } | |
202 myximage->data = Shminfo[0].shmaddr; | |
203 ImageData = (unsigned char *) myximage->data; | |
204 Shminfo[0].readOnly = False; | |
205 XShmAttach(mDisplay, &Shminfo[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
|
206 |
12582 | 207 XSync(mDisplay, False); |
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
|
208 |
12582 | 209 if (gXErrorFlag) |
210 { | |
211 XDestroyImage(myximage); | |
212 shmdt(Shminfo[0].shmaddr); | |
213 mp_msg(MSGT_VO, MSGL_WARN, "Shared memory error,disabling.\n"); | |
214 gXErrorFlag = 0; | |
215 goto shmemerror; | |
216 } else | |
217 shmctl(Shminfo[0].shmid, IPC_RMID, 0); | |
218 | |
219 { | |
220 static int firstTime = 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
|
221 |
12582 | 222 if (firstTime) |
223 { | |
224 mp_msg(MSGT_VO, MSGL_V, "Sharing memory.\n"); | |
225 firstTime = 0; | |
226 } | |
227 } | |
228 } else | |
229 { | |
230 shmemerror: | |
231 Shmem_Flag = 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
|
232 #endif |
21584
3ddf91e141a3
Use XCreateImage instead of XGetImage, this is not only more correct and
reimar
parents:
20399
diff
changeset
|
233 myximage = XCreateImage(mDisplay, vinfo.visual, depth, ZPixmap, |
3ddf91e141a3
Use XCreateImage instead of XGetImage, this is not only more correct and
reimar
parents:
20399
diff
changeset
|
234 0, NULL, image_width, image_height, 8, 0); |
21585
e54f539c9b5d
Align image data pointer, this is also in preparation of an upcoming patch
reimar
parents:
21584
diff
changeset
|
235 ImageDataOrig = malloc(myximage->bytes_per_line * image_height + 32); |
e54f539c9b5d
Align image data pointer, this is also in preparation of an upcoming patch
reimar
parents:
21584
diff
changeset
|
236 myximage->data = ImageDataOrig + 16 - ((long)ImageDataOrig & 15); |
21584
3ddf91e141a3
Use XCreateImage instead of XGetImage, this is not only more correct and
reimar
parents:
20399
diff
changeset
|
237 memset(myximage->data, 0, myximage->bytes_per_line * image_height); |
12582 | 238 ImageData = myximage->data; |
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
|
239 #ifdef HAVE_SHM |
12582 | 240 } |
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
|
241 #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
|
242 } |
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
|
243 |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
16171
diff
changeset
|
244 static void freeMyXImage(void) |
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
|
245 { |
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
|
246 #ifdef HAVE_SHM |
12582 | 247 if (Shmem_Flag) |
248 { | |
249 XShmDetach(mDisplay, &Shminfo[0]); | |
250 XDestroyImage(myximage); | |
251 shmdt(Shminfo[0].shmaddr); | |
252 } else | |
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
|
253 #endif |
12582 | 254 { |
21585
e54f539c9b5d
Align image data pointer, this is also in preparation of an upcoming patch
reimar
parents:
21584
diff
changeset
|
255 myximage->data = ImageDataOrig; |
12582 | 256 XDestroyImage(myximage); |
21585
e54f539c9b5d
Align image data pointer, this is also in preparation of an upcoming patch
reimar
parents:
21584
diff
changeset
|
257 ImageDataOrig = NULL; |
12582 | 258 } |
259 myximage = NULL; | |
21584
3ddf91e141a3
Use XCreateImage instead of XGetImage, this is not only more correct and
reimar
parents:
20399
diff
changeset
|
260 ImageData = NULL; |
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
|
261 } |
2218 | 262 |
20399
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
263 #ifdef WORDS_BIGENDIAN |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
264 #define BO_NATIVE MSBFirst |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
265 #define BO_NONNATIVE LSBFirst |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
266 #else |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
267 #define BO_NATIVE LSBFirst |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
268 #define BO_NONNATIVE MSBFirst |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
269 #endif |
25239 | 270 const struct fmt2Xfmtentry_s { |
20399
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
271 uint32_t mpfmt; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
272 int byte_order; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
273 unsigned red_mask; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
274 unsigned green_mask; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
275 unsigned blue_mask; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
276 } fmt2Xfmt[] = { |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
277 {IMGFMT_RGB8, BO_NATIVE, 0x00000007, 0x00000038, 0x000000C0}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
278 {IMGFMT_RGB8, BO_NONNATIVE, 0x00000007, 0x00000038, 0x000000C0}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
279 {IMGFMT_BGR8, BO_NATIVE, 0x000000E0, 0x0000001C, 0x00000003}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
280 {IMGFMT_BGR8, BO_NONNATIVE, 0x000000E0, 0x0000001C, 0x00000003}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
281 {IMGFMT_RGB15, BO_NATIVE, 0x0000001F, 0x000003E0, 0x00007C00}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
282 {IMGFMT_BGR15, BO_NATIVE, 0x00007C00, 0x000003E0, 0x0000001F}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
283 {IMGFMT_RGB16, BO_NATIVE, 0x0000001F, 0x000007E0, 0x0000F800}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
284 {IMGFMT_BGR16, BO_NATIVE, 0x0000F800, 0x000007E0, 0x0000001F}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
285 {IMGFMT_RGB24, MSBFirst, 0x00FF0000, 0x0000FF00, 0x000000FF}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
286 {IMGFMT_RGB24, LSBFirst, 0x000000FF, 0x0000FF00, 0x00FF0000}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
287 {IMGFMT_BGR24, MSBFirst, 0x000000FF, 0x0000FF00, 0x00FF0000}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
288 {IMGFMT_BGR24, LSBFirst, 0x00FF0000, 0x0000FF00, 0x000000FF}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
289 {IMGFMT_RGB32, BO_NATIVE, 0x000000FF, 0x0000FF00, 0x00FF0000}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
290 {IMGFMT_RGB32, BO_NONNATIVE, 0xFF000000, 0x00FF0000, 0x0000FF00}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
291 {IMGFMT_BGR32, BO_NATIVE, 0x00FF0000, 0x0000FF00, 0x000000FF}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
292 {IMGFMT_BGR32, BO_NONNATIVE, 0x0000FF00, 0x00FF0000, 0xFF000000}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
293 {IMGFMT_ARGB, MSBFirst, 0x00FF0000, 0x0000FF00, 0x000000FF}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
294 {IMGFMT_ARGB, LSBFirst, 0x0000FF00, 0x00FF0000, 0xFF000000}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
295 {IMGFMT_ABGR, MSBFirst, 0x000000FF, 0x0000FF00, 0x00FF0000}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
296 {IMGFMT_ABGR, LSBFirst, 0xFF000000, 0x00FF0000, 0x0000FF00}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
297 {IMGFMT_RGBA, MSBFirst, 0xFF000000, 0x00FF0000, 0x0000FF00}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
298 {IMGFMT_RGBA, LSBFirst, 0x000000FF, 0x0000FF00, 0x00FF0000}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
299 {IMGFMT_BGRA, MSBFirst, 0x0000FF00, 0x00FF0000, 0xFF000000}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
300 {IMGFMT_BGRA, LSBFirst, 0x00FF0000, 0x0000FF00, 0x000000FF}, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
301 {0, 0, 0, 0, 0} |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
302 }; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
303 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
304 static int config(uint32_t width, uint32_t height, uint32_t d_width, |
12582 | 305 uint32_t d_height, uint32_t flags, char *title, |
306 uint32_t format) | |
1 | 307 { |
1110 | 308 // int screen; |
12582 | 309 int fullscreen = 0; |
310 int vm = 0; | |
311 | |
1110 | 312 // int interval, prefer_blank, allow_exp, nothing; |
12582 | 313 unsigned int fg, bg; |
314 XGCValues xgcv; | |
315 Colormap theCmap; | |
316 XSetWindowAttributes xswa; | |
317 unsigned long xswamask; | |
25239 | 318 const struct fmt2Xfmtentry_s *fmte = fmt2Xfmt; |
12582 | 319 |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
320 #ifdef HAVE_XF86VM |
12582 | 321 unsigned int modeline_width, modeline_height; |
322 static uint32_t vm_width; | |
323 static uint32_t vm_height; | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
324 #endif |
1 | 325 |
12582 | 326 vo_mouse_autohide = 1; |
327 old_vo_dwidth = -1; | |
328 old_vo_dheight = -1; | |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
329 |
12582 | 330 if (!title) |
17787 | 331 title = "MPlayer X11 (XImage/Shm) render"; |
4813 | 332 |
12582 | 333 in_format = format; |
334 srcW = width; | |
335 srcH = height; | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
336 |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
337 if (flags & (VOFLAG_FULLSCREEN|VOFLAG_MODESWITCHING)) |
12582 | 338 fullscreen = 1; |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
339 if (flags & VOFLAG_MODESWITCHING) |
12582 | 340 vm = 1; |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
341 if (flags & VOFLAG_FLIPPING) |
12582 | 342 Flip_Flag = 1; |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
343 zoomFlag = flags & VOFLAG_SWSCALE; |
12582 | 344 |
345 int_pause = 0; | |
4677
305a0c20bde4
default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents:
4662
diff
changeset
|
346 // if(!fullscreen) zoomFlag=1; //it makes no sense to avoid zooming on windowd mode |
12582 | 347 |
2218 | 348 //printf( "w: %d h: %d\n\n",vo_dwidth,vo_dheight ); |
1746 | 349 |
12582 | 350 XGetWindowAttributes(mDisplay, mRootWin, &attribs); |
351 depth = attribs.depth; | |
352 | |
353 if (depth != 15 && depth != 16 && depth != 24 && depth != 32) | |
354 { | |
355 Visual *visual; | |
1746 | 356 |
12582 | 357 depth = vo_find_depth_from_visuals(mDisplay, mScreen, &visual); |
358 } | |
359 if (!XMatchVisualInfo(mDisplay, mScreen, depth, DirectColor, &vinfo) || | |
360 (WinID > 0 | |
361 && vinfo.visualid != XVisualIDFromVisual(attribs.visual))) | |
362 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo); | |
1746 | 363 |
12582 | 364 /* set image size (which is indeed neither the input nor output size), |
365 if zoom is on it will be changed during draw_slice anyway so we don't duplicate the aspect code here | |
366 */ | |
367 image_width = (width + 7) & (~7); | |
368 image_height = height; | |
4661
4df2400b0527
-fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents:
4658
diff
changeset
|
369 |
12582 | 370 aspect = ((1 << 16) * d_width + d_height / 2) / d_height; |
2218 | 371 |
1752 | 372 #ifdef HAVE_NEW_GUI |
12582 | 373 if (use_gui) |
374 guiGetEvent(guiSetShVideo, 0); // the GUI will set up / resize the window | |
375 else | |
376 #endif | |
377 { | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
378 #ifdef HAVE_XF86VM |
12582 | 379 if (vm) |
380 { | |
381 if ((d_width == 0) && (d_height == 0)) | |
382 { | |
383 vm_width = image_width; | |
384 vm_height = image_height; | |
385 } else | |
386 { | |
387 vm_width = d_width; | |
388 vm_height = d_height; | |
389 } | |
390 vo_vm_switch(vm_width, vm_height, &modeline_width, | |
391 &modeline_height); | |
392 vo_dx = (vo_screenwidth - modeline_width) / 2; | |
393 vo_dy = (vo_screenheight - modeline_height) / 2; | |
394 vo_dwidth = modeline_width; | |
395 vo_dheight = modeline_height; | |
396 } | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
397 #endif |
12582 | 398 bg = WhitePixel(mDisplay, mScreen); |
399 fg = BlackPixel(mDisplay, mScreen); | |
1 | 400 |
12582 | 401 theCmap = vo_x11_create_colormap(&vinfo); |
1 | 402 |
12582 | 403 xswa.background_pixel = 0; |
404 xswa.border_pixel = 0; | |
405 xswa.colormap = theCmap; | |
406 xswamask = CWBackPixel | CWBorderPixel | CWColormap; | |
1 | 407 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
408 #ifdef HAVE_XF86VM |
12582 | 409 if (vm) |
410 { | |
411 xswa.override_redirect = True; | |
412 xswamask |= CWOverrideRedirect; | |
413 } | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
414 #endif |
12582 | 415 |
416 if (WinID >= 0) | |
417 { | |
418 vo_window = WinID ? ((Window) WinID) : mRootWin; | |
419 if (WinID) | |
420 { | |
15540 | 421 int border; |
12582 | 422 XUnmapWindow(mDisplay, vo_window); |
423 XChangeWindowAttributes(mDisplay, vo_window, xswamask, | |
424 &xswa); | |
425 vo_x11_selectinput_witherr(mDisplay, vo_window, | |
426 StructureNotifyMask | | |
427 KeyPressMask | | |
428 PropertyChangeMask | | |
429 PointerMotionMask | | |
430 ButtonPressMask | | |
431 ButtonReleaseMask | | |
432 ExposureMask); | |
433 XMapWindow(mDisplay, vo_window); | |
15540 | 434 XGetGeometry(mDisplay, vo_window, &mRootWin, |
435 &vo_dx, &vo_dy, &vo_dwidth, &vo_dheight, | |
436 &border, &depth); | |
12582 | 437 } else |
438 XSelectInput(mDisplay, vo_window, ExposureMask); | |
439 } else | |
440 { | |
23655
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23381
diff
changeset
|
441 vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy, d_width, d_height, |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23381
diff
changeset
|
442 flags, theCmap, "x11", title); |
12582 | 443 } |
6043 | 444 |
12582 | 445 XSync(mDisplay, False); |
1 | 446 |
12582 | 447 vo_x11_selectinput_witherr(mDisplay, vo_window, |
448 StructureNotifyMask | KeyPressMask | | |
449 PropertyChangeMask | ExposureMask | | |
450 ((WinID == | |
451 0) ? 0 : (ButtonPressMask | | |
452 ButtonReleaseMask | | |
453 PointerMotionMask))); | |
4805 | 454 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
455 #ifdef HAVE_XF86VM |
12582 | 456 if (vm) |
457 { | |
458 /* Grab the mouse pointer in our window */ | |
459 if (vo_grabpointer) | |
460 XGrabPointer(mDisplay, vo_window, True, 0, | |
461 GrabModeAsync, GrabModeAsync, | |
462 vo_window, None, CurrentTime); | |
463 XSetInputFocus(mDisplay, vo_window, RevertToNone, CurrentTime); | |
464 } | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
465 #endif |
12582 | 466 } |
1 | 467 |
12582 | 468 if (vo_gc != None) |
469 XFreeGC(mDisplay, vo_gc); | |
470 vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv); | |
471 | |
472 if (myximage) | |
473 { | |
474 freeMyXImage(); | |
475 sws_freeContext(swsContext); | |
476 } | |
477 getMyXImage(); | |
478 | |
479 if (!WinID) | |
480 { | |
481 vo_dwidth = vo_screenwidth; | |
482 vo_dheight = vo_screenheight; | |
483 } | |
1 | 484 |
20399
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
485 while (fmte->mpfmt) { |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
486 if (IMGFMT_RGB_DEPTH(fmte->mpfmt) == myximage->bits_per_pixel && |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
487 fmte->byte_order == myximage->byte_order && |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
488 fmte->red_mask == myximage->red_mask && |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
489 fmte->green_mask == myximage->green_mask && |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
490 fmte->blue_mask == myximage->blue_mask) |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
491 break; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
492 fmte++; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
493 } |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
494 if (!fmte->mpfmt) { |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
495 mp_msg(MSGT_VO, MSGL_ERR, |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
496 "X server image format not supported, please contact the developers\n"); |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
497 return -1; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
498 } |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
499 out_format = fmte->mpfmt; |
12582 | 500 switch ((bpp = myximage->bits_per_pixel)) |
501 { | |
502 case 24: | |
503 draw_alpha_fnc = draw_alpha_24; | |
504 break; | |
505 case 32: | |
506 draw_alpha_fnc = draw_alpha_32; | |
507 break; | |
508 case 15: | |
509 case 16: | |
510 if (depth == 15) | |
511 draw_alpha_fnc = draw_alpha_15; | |
20399
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
512 else |
12582 | 513 draw_alpha_fnc = draw_alpha_16; |
514 break; | |
515 default: | |
516 draw_alpha_fnc = draw_alpha_null; | |
517 } | |
21586
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
518 out_offset = 0; |
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
519 // for these formats conversion is currently not support and |
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
520 // we can easily "emulate" them. |
21599
fe48c337a269
10l, missing () in check for 32bit endian-conversion hack
reimar
parents:
21586
diff
changeset
|
521 if (out_format & 64 && (IMGFMT_IS_RGB(out_format) || IMGFMT_IS_BGR(out_format))) { |
21586
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
522 out_format &= ~64; |
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
523 #ifdef WORDS_BIGENDIAN |
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
524 out_offset = 1; |
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
525 #else |
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
526 out_offset = -1; |
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
527 #endif |
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
528 } |
1 | 529 |
12582 | 530 /* always allocate swsContext as size could change between frames */ |
531 swsContext = | |
532 sws_getContextFromCmdLine(width, height, in_format, width, height, | |
533 out_format); | |
534 if (!swsContext) | |
535 return -1; | |
1 | 536 |
18746 | 537 dst_width = width; |
12582 | 538 //printf( "X11 bpp: %d color mask: R:%lX G:%lX B:%lX\n",bpp,myximage->red_mask,myximage->green_mask,myximage->blue_mask ); |
1 | 539 |
12582 | 540 if (vo_ontop) |
541 vo_x11_setlayer(mDisplay, vo_window, vo_ontop); | |
11542 | 542 |
12582 | 543 return 0; |
1 | 544 } |
545 | |
12582 | 546 static void Display_Image(XImage * myximage, uint8_t * ImageData) |
1 | 547 { |
21586
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
548 myximage->data += out_offset; |
3003 | 549 #ifdef HAVE_SHM |
12582 | 550 if (Shmem_Flag) |
551 { | |
552 XShmPutImage(mDisplay, vo_window, vo_gc, myximage, | |
553 0, 0, | |
18746 | 554 (vo_dwidth - dst_width) / 2, |
555 (vo_dheight - myximage->height) / 2, dst_width, | |
12582 | 556 myximage->height, True); |
557 } else | |
1 | 558 #endif |
12582 | 559 { |
560 XPutImage(mDisplay, vo_window, vo_gc, myximage, | |
561 0, 0, | |
18746 | 562 (vo_dwidth - dst_width) / 2, |
563 (vo_dheight - myximage->height) / 2, dst_width, | |
12582 | 564 myximage->height); |
565 } | |
21586
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
566 myximage->data -= out_offset; |
1 | 567 } |
568 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
569 static void draw_osd(void) |
12582 | 570 { |
571 vo_draw_text(image_width, image_height, draw_alpha_fnc); | |
572 } | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
573 |
12582 | 574 static void flip_page(void) |
575 { | |
576 Display_Image(myximage, ImageData); | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
577 XSync(mDisplay, False); |
31 | 578 } |
1 | 579 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
580 static int draw_slice(uint8_t * src[], int stride[], int w, int h, |
12582 | 581 int x, int y) |
1 | 582 { |
12582 | 583 uint8_t *dst[3]; |
584 int dstStride[3]; | |
6059 | 585 |
12582 | 586 if ((old_vo_dwidth != vo_dwidth |
587 || old_vo_dheight != vo_dheight) /*&& y==0 */ && zoomFlag) | |
588 { | |
589 int newW = vo_dwidth; | |
590 int newH = vo_dheight; | |
591 int newAspect = (newW * (1 << 16) + (newH >> 1)) / newH; | |
18746 | 592 struct SwsContext *oldContext = swsContext; |
4641 | 593 |
12582 | 594 if (newAspect > aspect) |
595 newW = (newH * aspect + (1 << 15)) >> 16; | |
596 else | |
597 newH = ((newW << 16) + (aspect >> 1)) / aspect; | |
4641 | 598 |
12582 | 599 old_vo_dwidth = vo_dwidth; |
600 old_vo_dheight = vo_dheight; | |
601 | |
602 if (sws_flags == 0) | |
603 newW &= (~31); // not needed but, if the user wants the FAST_BILINEAR SCALER, then its needed | |
4627 | 604 |
12582 | 605 swsContext = sws_getContextFromCmdLine(srcW, srcH, in_format, |
606 newW, newH, out_format); | |
607 if (swsContext) | |
608 { | |
609 image_width = (newW + 7) & (~7); | |
610 image_height = 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
|
611 |
12582 | 612 freeMyXImage(); |
613 getMyXImage(); | |
614 sws_freeContext(oldContext); | |
615 } else | |
616 { | |
617 swsContext = oldContext; | |
618 } | |
18746 | 619 dst_width = newW; |
12582 | 620 } |
621 dstStride[1] = dstStride[2] = 0; | |
622 dst[1] = dst[2] = NULL; | |
623 | |
23284 | 624 dstStride[0] = image_width * ((bpp + 7) / 8); |
625 dst[0] = ImageData; | |
12582 | 626 if (Flip_Flag) |
627 { | |
23284 | 628 dst[0] += dstStride[0] * (image_height - 1); |
629 dstStride[0] = -dstStride[0]; | |
12582 | 630 } |
23282 | 631 sws_scale_ordered(swsContext, src, stride, y, h, dst, dstStride); |
12582 | 632 return 0; |
1 | 633 } |
634 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
635 static int draw_frame(uint8_t * src[]) |
12582 | 636 { |
7683 | 637 #if 0 |
12582 | 638 int stride[3] = { 0, 0, 0 }; |
639 | |
640 if (in_format == IMGFMT_YUY2) | |
641 stride[0] = srcW * 2; | |
642 else if (in_format == IMGFMT_BGR8) | |
643 stride[0] = srcW; | |
644 else if (in_format == IMGFMT_BGR15) | |
645 stride[0] = srcW * 2; | |
646 else if (in_format == IMGFMT_BGR16) | |
647 stride[0] = srcW * 2; | |
648 else if (in_format == IMGFMT_BGR24) | |
649 stride[0] = srcW * 3; | |
650 else if (in_format == IMGFMT_BGR32) | |
651 stride[0] = srcW * 4; | |
652 | |
653 return draw_slice(src, stride, srcW, srcH, 0, 0); | |
7683 | 654 #else |
18234
a107276371a8
Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents:
18116
diff
changeset
|
655 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_X11_DrawFrameCalled); |
7683 | 656 return -1; |
657 #endif | |
658 } | |
659 | |
12582 | 660 static uint32_t get_image(mp_image_t * mpi) |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
661 { |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
662 if (zoomFlag || |
12582 | 663 !IMGFMT_IS_BGR(mpi->imgfmt) || |
664 (IMGFMT_BGR_DEPTH(mpi->imgfmt) != vo_depthonscreen) || | |
665 ((mpi->type != MP_IMGTYPE_STATIC) | |
666 && (mpi->type != MP_IMGTYPE_TEMP)) | |
667 || (mpi->flags & MP_IMGFLAG_PLANAR) | |
668 || (mpi->flags & MP_IMGFLAG_YUV) || (mpi->width != image_width) | |
669 || (mpi->height != image_height)) | |
670 return (VO_FALSE); | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
671 |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
672 if (Flip_Flag) |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
673 { |
12582 | 674 mpi->stride[0] = -image_width * ((bpp + 7) / 8); |
675 mpi->planes[0] = ImageData - mpi->stride[0] * (image_height - 1); | |
676 } else | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
677 { |
12582 | 678 mpi->stride[0] = image_width * ((bpp + 7) / 8); |
679 mpi->planes[0] = ImageData; | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
680 } |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
681 mpi->flags |= MP_IMGFLAG_DIRECT; |
12582 | 682 |
683 return (VO_TRUE); | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
684 } |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
685 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
686 static int query_format(uint32_t format) |
1 | 687 { |
12582 | 688 mp_msg(MSGT_VO, MSGL_DBG2, |
689 "vo_x11: query_format was called: %x (%s)\n", format, | |
690 vo_format_name(format)); | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
691 if (IMGFMT_IS_BGR(format)) |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
692 { |
12582 | 693 if (IMGFMT_BGR_DEPTH(format) <= 8) |
694 return 0; // TODO 8bpp not yet fully implemented | |
695 if (IMGFMT_BGR_DEPTH(format) == vo_depthonscreen) | |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
696 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP | |
12582 | 697 VFCAP_ACCEPT_STRIDE; |
698 else | |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
699 return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP | |
12582 | 700 VFCAP_ACCEPT_STRIDE; |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
701 } |
325 | 702 |
12582 | 703 switch (format) |
704 { | |
6692
ad521fb49a5e
-vm -fs -zoom fix, set correct vm screenres in aspect code (similar to xv fix).
atmos4
parents:
6180
diff
changeset
|
705 // case IMGFMT_BGR8: |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
706 // case IMGFMT_BGR15: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
707 // case IMGFMT_BGR16: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
708 // case IMGFMT_BGR24: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
709 // case IMGFMT_BGR32: |
6694
9291268a3603
1000l, back out hack-n-slay 8bpp code from my local tree.
atmos4
parents:
6693
diff
changeset
|
710 // return 0x2; |
4905
eb1a28f1236a
yuy2 support disabled to workaround stupid colorspace selection
michael
parents:
4889
diff
changeset
|
711 // case IMGFMT_YUY2: |
12582 | 712 case IMGFMT_I420: |
713 case IMGFMT_IYUV: | |
714 case IMGFMT_YV12: | |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
715 return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_ACCEPT_STRIDE; |
12582 | 716 } |
717 return 0; | |
1 | 718 } |
719 | |
720 | |
7683 | 721 static void uninit(void) |
1 | 722 { |
12582 | 723 if (!myximage) |
724 return; | |
725 | |
726 freeMyXImage(); | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
727 |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
728 #ifdef HAVE_XF86VM |
12582 | 729 vo_vm_close(mDisplay); |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
730 #endif |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
731 |
12582 | 732 zoomFlag = 0; |
733 vo_x11_uninit(); | |
4677
305a0c20bde4
default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents:
4662
diff
changeset
|
734 |
12582 | 735 sws_freeContext(swsContext); |
1 | 736 } |
737 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
738 static int preinit(const char *arg) |
4352 | 739 { |
12582 | 740 if (arg) |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4734
diff
changeset
|
741 { |
12582 | 742 mp_msg(MSGT_VO, MSGL_ERR, "vo_x11: Unknown subdevice: %s\n", arg); |
743 return ENOSYS; | |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4734
diff
changeset
|
744 } |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
745 |
12582 | 746 if (!vo_init()) |
747 return -1; // Can't open X11 | |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4734
diff
changeset
|
748 return 0; |
4352 | 749 } |
1 | 750 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
751 static int control(uint32_t request, void *data, ...) |
4352 | 752 { |
12582 | 753 switch (request) |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
754 { |
12582 | 755 case VOCTRL_PAUSE: |
756 return (int_pause = 1); | |
757 case VOCTRL_RESUME: | |
758 return (int_pause = 0); | |
759 case VOCTRL_QUERY_FORMAT: | |
760 return query_format(*((uint32_t *) data)); | |
761 case VOCTRL_GUISUPPORT: | |
762 return VO_TRUE; | |
763 case VOCTRL_GET_IMAGE: | |
764 return get_image(data); | |
765 case VOCTRL_SET_EQUALIZER: | |
766 { | |
767 va_list ap; | |
768 int value; | |
769 | |
770 va_start(ap, data); | |
771 value = va_arg(ap, int); | |
772 | |
773 va_end(ap); | |
774 return vo_x11_set_equalizer(data, value); | |
775 } | |
776 case VOCTRL_GET_EQUALIZER: | |
777 { | |
778 va_list ap; | |
779 int *value; | |
780 | |
781 va_start(ap, data); | |
782 value = va_arg(ap, int *); | |
783 | |
784 va_end(ap); | |
785 return vo_x11_get_equalizer(data, value); | |
786 } | |
787 case VOCTRL_ONTOP: | |
788 vo_x11_ontop(); | |
789 return VO_TRUE; | |
790 case VOCTRL_FULLSCREEN: | |
791 { | |
792 vo_x11_fullscreen(); | |
793 vo_x11_clearwindow(mDisplay, vo_window); | |
794 } | |
795 return VO_TRUE; | |
22232 | 796 case VOCTRL_UPDATE_SCREENINFO: |
797 update_xinerama_info(); | |
798 return VO_TRUE; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
799 } |
12582 | 800 return VO_NOTIMPL; |
4352 | 801 } |