Mercurial > mplayer.hg
annotate libvo/vo_x11.c @ 33194:5d84566f9143
Use metadata API to fix compilation.
author | reimar |
---|---|
date | Fri, 22 Apr 2011 06:36:16 +0000 |
parents | fbe5c829c69b |
children | 899d817e56fc |
rev | line source |
---|---|
28446
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28149
diff
changeset
|
1 /* |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28149
diff
changeset
|
2 * This file is part of MPlayer. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28149
diff
changeset
|
3 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28149
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28149
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28149
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28149
diff
changeset
|
7 * (at your option) any later version. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28149
diff
changeset
|
8 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28149
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28149
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28149
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28149
diff
changeset
|
12 * GNU General Public License for more details. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28149
diff
changeset
|
13 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28149
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28149
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28149
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28149
diff
changeset
|
17 */ |
1 | 18 |
19 #include <stdio.h> | |
20 #include <stdlib.h> | |
21 #include <string.h> | |
22 | |
23 #include "config.h" | |
24 #include "video_out.h" | |
25 #include "video_out_internal.h" | |
27972
f7b92cea7436
Use aspect.c code in vo_x11.c. Removes some inconsistencies in -wid handling.
reimar
parents:
27943
diff
changeset
|
26 #include "aspect.h" |
1 | 27 |
28 | |
29 #include <X11/Xlib.h> | |
30 #include <X11/Xutil.h> | |
4036 | 31 |
1 | 32 #include <errno.h> |
33 | |
31 | 34 #include "x11_common.h" |
35 | |
11690
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
36 #ifdef HAVE_SHM |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
37 #include <sys/ipc.h> |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
38 #include <sys/shm.h> |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
39 #include <X11/extensions/XShm.h> |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
40 |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
41 static int Shmem_Flag; |
12582 | 42 |
25962 | 43 //static int Quiet_Flag; Here also what is this for. It's used but isn't initialized? |
11690
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
44 static XShmSegmentInfo Shminfo[1]; |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
45 static int gXErrorFlag; |
12582 | 46 static int CompletionType = -1; |
11690
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
47 #endif |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
48 |
32467 | 49 #include "sub/sub.h" |
350 | 50 |
18861 | 51 #include "libswscale/swscale.h" |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13056
diff
changeset
|
52 #include "libmpcodecs/vf_scale.h" |
18746 | 53 #define MODE_RGB 0x1 |
54 #define MODE_BGR 0x2 | |
2218 | 55 |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13056
diff
changeset
|
56 #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
|
57 #include "help_mp.h" |
4734 | 58 |
25216 | 59 static const vo_info_t info = { |
12582 | 60 "X11 ( XImage/Shm )", |
61 "x11", | |
62 "Aaron Holtzman <aholtzma@ess.engr.uvic.ca>", | |
63 "" | |
1 | 64 }; |
65 | |
25220
c9e9ac2008c2
Mark the vo_functions_t definitions as const where possible.
reimar
parents:
25216
diff
changeset
|
66 const LIBVO_EXTERN(x11) |
1 | 67 /* private prototypes */ |
12582 | 68 static void (*draw_alpha_fnc) (int x0, int y0, int w, int h, |
69 unsigned char *src, unsigned char *srca, | |
70 int stride); | |
1 | 71 |
72 /* local data */ | |
73 static unsigned char *ImageData; | |
21585
e54f539c9b5d
Align image data pointer, this is also in preparation of an upcoming patch
reimar
parents:
21584
diff
changeset
|
74 //! original unaligned pointer for free |
e54f539c9b5d
Align image data pointer, this is also in preparation of an upcoming patch
reimar
parents:
21584
diff
changeset
|
75 static unsigned char *ImageDataOrig; |
1 | 76 |
77 /* X11 related variables */ | |
7764 | 78 static XImage *myximage = NULL; |
23381
300e9b7c499f
Remove some unused variables, patch by timwoj ieee org.
diego
parents:
23376
diff
changeset
|
79 static int depth, bpp; |
1 | 80 static XWindowAttributes attribs; |
81 | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
82 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
|
83 |
2969 | 84 static int Flip_Flag; |
4661
4df2400b0527
-fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents:
4658
diff
changeset
|
85 static int zoomFlag; |
2969 | 86 |
1 | 87 |
88 static uint32_t image_width; | |
89 static uint32_t image_height; | |
4641 | 90 static uint32_t in_format; |
12582 | 91 static uint32_t out_format = 0; |
21586
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
92 static int out_offset; |
12582 | 93 static int srcW = -1; |
94 static int srcH = -1; | |
1 | 95 |
12582 | 96 static int old_vo_dwidth = -1; |
97 static int old_vo_dheight = -1; | |
98 | |
22886 | 99 static void check_events(void) |
12582 | 100 { |
101 int ret = vo_x11_check_events(mDisplay); | |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
102 |
27977
452231ce45b9
Clear the whole window on resize in vo_x11 since we do not
reimar
parents:
27976
diff
changeset
|
103 if (ret & VO_EVENT_RESIZE) |
452231ce45b9
Clear the whole window on resize in vo_x11 since we do not
reimar
parents:
27976
diff
changeset
|
104 vo_x11_clearwindow(mDisplay, vo_window); |
452231ce45b9
Clear the whole window on resize in vo_x11 since we do not
reimar
parents:
27976
diff
changeset
|
105 else if (ret & VO_EVENT_EXPOSE) |
12582 | 106 vo_x11_clearwindow_part(mDisplay, vo_window, myximage->width, |
107 myximage->height, 0); | |
27976 | 108 if (ret & VO_EVENT_EXPOSE && int_pause) |
12582 | 109 flip_page(); |
110 } | |
111 | |
112 static void draw_alpha_32(int x0, int y0, int w, int h, unsigned char *src, | |
113 unsigned char *srca, int stride) | |
114 { | |
115 vo_draw_alpha_rgb32(w, h, src, srca, stride, | |
116 ImageData + 4 * (y0 * image_width + x0), | |
117 4 * image_width); | |
1 | 118 } |
119 | |
12582 | 120 static void draw_alpha_24(int x0, int y0, int w, int h, unsigned char *src, |
121 unsigned char *srca, int stride) | |
122 { | |
123 vo_draw_alpha_rgb24(w, h, src, srca, stride, | |
124 ImageData + 3 * (y0 * image_width + x0), | |
125 3 * image_width); | |
1647
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 |
12582 | 128 static void draw_alpha_16(int x0, int y0, int w, int h, unsigned char *src, |
129 unsigned char *srca, int stride) | |
130 { | |
131 vo_draw_alpha_rgb16(w, h, src, srca, stride, | |
132 ImageData + 2 * (y0 * image_width + x0), | |
133 2 * image_width); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
134 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
135 |
12582 | 136 static void draw_alpha_15(int x0, int y0, int w, int h, unsigned char *src, |
137 unsigned char *srca, int stride) | |
138 { | |
139 vo_draw_alpha_rgb15(w, h, src, srca, stride, | |
140 ImageData + 2 * (y0 * image_width + x0), | |
141 2 * image_width); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
142 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
143 |
12582 | 144 static void draw_alpha_null(int x0, int y0, int w, int h, |
145 unsigned char *src, unsigned char *srca, | |
146 int stride) | |
147 { | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
148 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
149 |
18746 | 150 static struct SwsContext *swsContext = NULL; |
151 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
|
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 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
|
154 |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
16171
diff
changeset
|
155 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
|
156 { |
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 #ifdef HAVE_SHM |
12582 | 158 if (mLocalDisplay && XShmQueryExtension(mDisplay)) |
159 Shmem_Flag = 1; | |
160 else | |
161 { | |
162 Shmem_Flag = 0; | |
163 mp_msg(MSGT_VO, MSGL_WARN, | |
164 "Shared memory not supported\nReverting to normal Xlib\n"); | |
165 } | |
166 if (Shmem_Flag) | |
167 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
|
168 |
12582 | 169 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
|
170 { |
12582 | 171 myximage = |
172 XShmCreateImage(mDisplay, vinfo.visual, depth, ZPixmap, NULL, | |
173 &Shminfo[0], image_width, image_height); | |
174 if (myximage == NULL) | |
175 { | |
176 mp_msg(MSGT_VO, MSGL_WARN, | |
177 "Shared memory error,disabling ( Ximage error )\n"); | |
178 goto shmemerror; | |
179 } | |
180 Shminfo[0].shmid = shmget(IPC_PRIVATE, | |
181 myximage->bytes_per_line * | |
182 myximage->height, IPC_CREAT | 0777); | |
183 if (Shminfo[0].shmid < 0) | |
184 { | |
185 XDestroyImage(myximage); | |
186 mp_msg(MSGT_VO, MSGL_V, "%s\n", strerror(errno)); | |
187 //perror( strerror( errno ) ); | |
188 mp_msg(MSGT_VO, MSGL_WARN, | |
189 "Shared memory error,disabling ( seg id error )\n"); | |
190 goto shmemerror; | |
191 } | |
192 Shminfo[0].shmaddr = (char *) shmat(Shminfo[0].shmid, 0, 0); | |
3209 | 193 |
12582 | 194 if (Shminfo[0].shmaddr == ((char *) -1)) |
195 { | |
196 XDestroyImage(myximage); | |
197 if (Shminfo[0].shmaddr != ((char *) -1)) | |
198 shmdt(Shminfo[0].shmaddr); | |
199 mp_msg(MSGT_VO, MSGL_WARN, | |
200 "Shared memory error,disabling ( address error )\n"); | |
201 goto shmemerror; | |
202 } | |
203 myximage->data = Shminfo[0].shmaddr; | |
204 ImageData = (unsigned char *) myximage->data; | |
205 Shminfo[0].readOnly = False; | |
206 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
|
207 |
12582 | 208 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
|
209 |
12582 | 210 if (gXErrorFlag) |
211 { | |
212 XDestroyImage(myximage); | |
213 shmdt(Shminfo[0].shmaddr); | |
214 mp_msg(MSGT_VO, MSGL_WARN, "Shared memory error,disabling.\n"); | |
215 gXErrorFlag = 0; | |
216 goto shmemerror; | |
217 } else | |
218 shmctl(Shminfo[0].shmid, IPC_RMID, 0); | |
219 | |
220 { | |
221 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
|
222 |
12582 | 223 if (firstTime) |
224 { | |
225 mp_msg(MSGT_VO, MSGL_V, "Sharing memory.\n"); | |
226 firstTime = 0; | |
227 } | |
228 } | |
229 } else | |
230 { | |
231 shmemerror: | |
232 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
|
233 #endif |
21584
3ddf91e141a3
Use XCreateImage instead of XGetImage, this is not only more correct and
reimar
parents:
20399
diff
changeset
|
234 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
|
235 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
|
236 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
|
237 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
|
238 memset(myximage->data, 0, myximage->bytes_per_line * image_height); |
12582 | 239 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
|
240 #ifdef HAVE_SHM |
12582 | 241 } |
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
|
242 #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
|
243 } |
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
|
244 |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
16171
diff
changeset
|
245 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
|
246 { |
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
|
247 #ifdef HAVE_SHM |
12582 | 248 if (Shmem_Flag) |
249 { | |
250 XShmDetach(mDisplay, &Shminfo[0]); | |
251 XDestroyImage(myximage); | |
252 shmdt(Shminfo[0].shmaddr); | |
253 } 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
|
254 #endif |
12582 | 255 { |
21585
e54f539c9b5d
Align image data pointer, this is also in preparation of an upcoming patch
reimar
parents:
21584
diff
changeset
|
256 myximage->data = ImageDataOrig; |
12582 | 257 XDestroyImage(myximage); |
21585
e54f539c9b5d
Align image data pointer, this is also in preparation of an upcoming patch
reimar
parents:
21584
diff
changeset
|
258 ImageDataOrig = NULL; |
12582 | 259 } |
260 myximage = NULL; | |
21584
3ddf91e141a3
Use XCreateImage instead of XGetImage, this is not only more correct and
reimar
parents:
20399
diff
changeset
|
261 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
|
262 } |
2218 | 263 |
29401
f01023c524c3
Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.
diego
parents:
29263
diff
changeset
|
264 #if HAVE_BIGENDIAN |
20399
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
265 #define BO_NATIVE MSBFirst |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
266 #define BO_NONNATIVE LSBFirst |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
267 #else |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
268 #define BO_NATIVE LSBFirst |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
269 #define BO_NONNATIVE MSBFirst |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
270 #endif |
25239 | 271 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
|
272 uint32_t mpfmt; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
273 int byte_order; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
274 unsigned red_mask; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
275 unsigned green_mask; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
276 unsigned blue_mask; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
277 } fmt2Xfmt[] = { |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
278 {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
|
279 {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
|
280 {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
|
281 {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
|
282 {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
|
283 {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
|
284 {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
|
285 {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
|
286 {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
|
287 {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
|
288 {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
|
289 {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
|
290 {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
|
291 {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
|
292 {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
|
293 {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
|
294 {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
|
295 {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
|
296 {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
|
297 {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
|
298 {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
|
299 {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
|
300 {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
|
301 {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
|
302 {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
|
303 }; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
304 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
305 static int config(uint32_t width, uint32_t height, uint32_t d_width, |
12582 | 306 uint32_t d_height, uint32_t flags, char *title, |
307 uint32_t format) | |
1 | 308 { |
1110 | 309 // int screen; |
12582 | 310 |
1110 | 311 // int interval, prefer_blank, allow_exp, nothing; |
12582 | 312 unsigned int fg, bg; |
313 Colormap theCmap; | |
314 XSetWindowAttributes xswa; | |
315 unsigned long xswamask; | |
25239 | 316 const struct fmt2Xfmtentry_s *fmte = fmt2Xfmt; |
12582 | 317 |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
318 #ifdef CONFIG_XF86VM |
27943 | 319 int vm = flags & VOFLAG_MODESWITCHING; |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
320 #endif |
27943 | 321 Flip_Flag = flags & VOFLAG_FLIPPING; |
322 zoomFlag = flags & VOFLAG_SWSCALE; | |
1 | 323 |
12582 | 324 old_vo_dwidth = -1; |
325 old_vo_dheight = -1; | |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
326 |
27880
a28ca0971d9a
Cosmetic changes to vo_x11 to reduce diff to vo_xv for future refactoring.
reimar
parents:
27879
diff
changeset
|
327 int_pause = 0; |
12582 | 328 if (!title) |
17787 | 329 title = "MPlayer X11 (XImage/Shm) render"; |
4813 | 330 |
12582 | 331 in_format = format; |
332 srcW = width; | |
333 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
|
334 |
12582 | 335 XGetWindowAttributes(mDisplay, mRootWin, &attribs); |
336 depth = attribs.depth; | |
337 | |
338 if (depth != 15 && depth != 16 && depth != 24 && depth != 32) | |
339 { | |
340 Visual *visual; | |
1746 | 341 |
12582 | 342 depth = vo_find_depth_from_visuals(mDisplay, mScreen, &visual); |
343 } | |
344 if (!XMatchVisualInfo(mDisplay, mScreen, depth, DirectColor, &vinfo) || | |
345 (WinID > 0 | |
346 && vinfo.visualid != XVisualIDFromVisual(attribs.visual))) | |
347 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo); | |
1746 | 348 |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29062
diff
changeset
|
349 /* set image size (which is indeed neither the input nor output size), |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29062
diff
changeset
|
350 if zoom is on it will be changed during draw_slice anyway so we don't duplicate the aspect code here |
12582 | 351 */ |
352 image_width = (width + 7) & (~7); | |
353 image_height = height; | |
4661
4df2400b0527
-fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents:
4658
diff
changeset
|
354 |
12582 | 355 { |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
356 #ifdef CONFIG_XF86VM |
12582 | 357 if (vm) |
358 { | |
27890
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
359 vo_vm_switch(); |
12582 | 360 } |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
361 #endif |
12582 | 362 bg = WhitePixel(mDisplay, mScreen); |
363 fg = BlackPixel(mDisplay, mScreen); | |
1 | 364 |
12582 | 365 theCmap = vo_x11_create_colormap(&vinfo); |
1 | 366 |
12582 | 367 xswa.background_pixel = 0; |
368 xswa.border_pixel = 0; | |
369 xswa.colormap = theCmap; | |
370 xswamask = CWBackPixel | CWBorderPixel | CWColormap; | |
1 | 371 |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
372 #ifdef CONFIG_XF86VM |
12582 | 373 if (vm) |
374 { | |
375 xswa.override_redirect = True; | |
376 xswamask |= CWOverrideRedirect; | |
377 } | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
378 #endif |
12582 | 379 |
27891
8742bcad99b5
Use vo_dwidth/vo_dheight for creating the windows instead of d_width/d_height.
reimar
parents:
27890
diff
changeset
|
380 vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy, vo_dwidth, vo_dheight, |
23655
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23381
diff
changeset
|
381 flags, theCmap, "x11", title); |
27927
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27903
diff
changeset
|
382 if (WinID > 0) |
6f199f065e15
Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents:
27903
diff
changeset
|
383 depth = vo_x11_update_geometry(); |
1 | 384 |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
385 #ifdef CONFIG_XF86VM |
12582 | 386 if (vm) |
387 { | |
388 /* Grab the mouse pointer in our window */ | |
389 if (vo_grabpointer) | |
390 XGrabPointer(mDisplay, vo_window, True, 0, | |
391 GrabModeAsync, GrabModeAsync, | |
392 vo_window, None, CurrentTime); | |
393 XSetInputFocus(mDisplay, vo_window, RevertToNone, CurrentTime); | |
394 } | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
395 #endif |
12582 | 396 } |
1 | 397 |
12582 | 398 if (myximage) |
399 { | |
400 freeMyXImage(); | |
401 sws_freeContext(swsContext); | |
402 } | |
403 getMyXImage(); | |
404 | |
20399
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
405 while (fmte->mpfmt) { |
27762
7efce8fe3a04
fixed image format detection for 15 bit color depths
faust3
parents:
27412
diff
changeset
|
406 int depth = IMGFMT_RGB_DEPTH(fmte->mpfmt); |
7efce8fe3a04
fixed image format detection for 15 bit color depths
faust3
parents:
27412
diff
changeset
|
407 /* bits_per_pixel in X seems to be set to 16 for 15 bit formats |
7efce8fe3a04
fixed image format detection for 15 bit color depths
faust3
parents:
27412
diff
changeset
|
408 => force depth to 16 so that only the color masks are used for the format check */ |
7efce8fe3a04
fixed image format detection for 15 bit color depths
faust3
parents:
27412
diff
changeset
|
409 if (depth == 15) |
7efce8fe3a04
fixed image format detection for 15 bit color depths
faust3
parents:
27412
diff
changeset
|
410 depth = 16; |
7efce8fe3a04
fixed image format detection for 15 bit color depths
faust3
parents:
27412
diff
changeset
|
411 |
7efce8fe3a04
fixed image format detection for 15 bit color depths
faust3
parents:
27412
diff
changeset
|
412 if (depth == myximage->bits_per_pixel && |
20399
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
413 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
|
414 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
|
415 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
|
416 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
|
417 break; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
418 fmte++; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
419 } |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
420 if (!fmte->mpfmt) { |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
421 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
|
422 "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
|
423 return -1; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
424 } |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
425 out_format = fmte->mpfmt; |
12582 | 426 switch ((bpp = myximage->bits_per_pixel)) |
427 { | |
428 case 24: | |
429 draw_alpha_fnc = draw_alpha_24; | |
430 break; | |
431 case 32: | |
432 draw_alpha_fnc = draw_alpha_32; | |
433 break; | |
434 case 15: | |
435 case 16: | |
436 if (depth == 15) | |
437 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
|
438 else |
12582 | 439 draw_alpha_fnc = draw_alpha_16; |
440 break; | |
441 default: | |
442 draw_alpha_fnc = draw_alpha_null; | |
443 } | |
21586
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
444 out_offset = 0; |
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
445 // 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
|
446 // we can easily "emulate" them. |
21599
fe48c337a269
10l, missing () in check for 32bit endian-conversion hack
reimar
parents:
21586
diff
changeset
|
447 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
|
448 out_format &= ~64; |
29401
f01023c524c3
Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.
diego
parents:
29263
diff
changeset
|
449 #if HAVE_BIGENDIAN |
21586
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
450 out_offset = 1; |
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
451 #else |
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
452 out_offset = -1; |
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
453 #endif |
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
454 } |
1 | 455 |
12582 | 456 /* always allocate swsContext as size could change between frames */ |
457 swsContext = | |
458 sws_getContextFromCmdLine(width, height, in_format, width, height, | |
459 out_format); | |
460 if (!swsContext) | |
461 return -1; | |
1 | 462 |
18746 | 463 dst_width = width; |
12582 | 464 //printf( "X11 bpp: %d color mask: R:%lX G:%lX B:%lX\n",bpp,myximage->red_mask,myximage->green_mask,myximage->blue_mask ); |
1 | 465 |
12582 | 466 return 0; |
1 | 467 } |
468 | |
12582 | 469 static void Display_Image(XImage * myximage, uint8_t * ImageData) |
1 | 470 { |
27901
88fad4f51a94
respect -vf dsize etc. also for -rootwin, just like vo_xv does.
reimar
parents:
27892
diff
changeset
|
471 int x = (vo_dwidth - dst_width) / 2; |
88fad4f51a94
respect -vf dsize etc. also for -rootwin, just like vo_xv does.
reimar
parents:
27892
diff
changeset
|
472 int y = (vo_dheight - myximage->height) / 2; |
27975
806c541d03dd
Do not draw in window if our image has not yet been adjusted to the new window size.
reimar
parents:
27974
diff
changeset
|
473 |
806c541d03dd
Do not draw in window if our image has not yet been adjusted to the new window size.
reimar
parents:
27974
diff
changeset
|
474 // do not draw if the image needs rescaling |
806c541d03dd
Do not draw in window if our image has not yet been adjusted to the new window size.
reimar
parents:
27974
diff
changeset
|
475 if ((old_vo_dwidth != vo_dwidth || old_vo_dheight != vo_dheight) && zoomFlag) |
806c541d03dd
Do not draw in window if our image has not yet been adjusted to the new window size.
reimar
parents:
27974
diff
changeset
|
476 return; |
806c541d03dd
Do not draw in window if our image has not yet been adjusted to the new window size.
reimar
parents:
27974
diff
changeset
|
477 |
27901
88fad4f51a94
respect -vf dsize etc. also for -rootwin, just like vo_xv does.
reimar
parents:
27892
diff
changeset
|
478 if (WinID == 0) { |
88fad4f51a94
respect -vf dsize etc. also for -rootwin, just like vo_xv does.
reimar
parents:
27892
diff
changeset
|
479 x = vo_dx; |
88fad4f51a94
respect -vf dsize etc. also for -rootwin, just like vo_xv does.
reimar
parents:
27892
diff
changeset
|
480 y = vo_dy; |
88fad4f51a94
respect -vf dsize etc. also for -rootwin, just like vo_xv does.
reimar
parents:
27892
diff
changeset
|
481 } |
21586
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
482 myximage->data += out_offset; |
3003 | 483 #ifdef HAVE_SHM |
12582 | 484 if (Shmem_Flag) |
485 { | |
486 XShmPutImage(mDisplay, vo_window, vo_gc, myximage, | |
487 0, 0, | |
27901
88fad4f51a94
respect -vf dsize etc. also for -rootwin, just like vo_xv does.
reimar
parents:
27892
diff
changeset
|
488 x, y, dst_width, |
12582 | 489 myximage->height, True); |
490 } else | |
1 | 491 #endif |
12582 | 492 { |
493 XPutImage(mDisplay, vo_window, vo_gc, myximage, | |
494 0, 0, | |
27901
88fad4f51a94
respect -vf dsize etc. also for -rootwin, just like vo_xv does.
reimar
parents:
27892
diff
changeset
|
495 x, y, dst_width, |
12582 | 496 myximage->height); |
497 } | |
21586
5a1e078720e7
Support for different endianness on client and server with -vo x11
reimar
parents:
21585
diff
changeset
|
498 myximage->data -= out_offset; |
1 | 499 } |
500 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
501 static void draw_osd(void) |
12582 | 502 { |
503 vo_draw_text(image_width, image_height, draw_alpha_fnc); | |
504 } | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
505 |
12582 | 506 static void flip_page(void) |
507 { | |
508 Display_Image(myximage, ImageData); | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
509 XSync(mDisplay, False); |
31 | 510 } |
1 | 511 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
512 static int draw_slice(uint8_t * src[], int stride[], int w, int h, |
12582 | 513 int x, int y) |
1 | 514 { |
29062
6a0a30aa2b4a
Consistently use MP_MAX_PLANES as size for plane pointer/stride arrays in libvo.
reimar
parents:
28446
diff
changeset
|
515 uint8_t *dst[MP_MAX_PLANES] = {NULL}; |
6a0a30aa2b4a
Consistently use MP_MAX_PLANES as size for plane pointer/stride arrays in libvo.
reimar
parents:
28446
diff
changeset
|
516 int dstStride[MP_MAX_PLANES] = {0}; |
6059 | 517 |
12582 | 518 if ((old_vo_dwidth != vo_dwidth |
519 || old_vo_dheight != vo_dheight) /*&& y==0 */ && zoomFlag) | |
520 { | |
521 int newW = vo_dwidth; | |
522 int newH = vo_dheight; | |
18746 | 523 struct SwsContext *oldContext = swsContext; |
4641 | 524 |
12582 | 525 old_vo_dwidth = vo_dwidth; |
526 old_vo_dheight = vo_dheight; | |
527 | |
27972
f7b92cea7436
Use aspect.c code in vo_x11.c. Removes some inconsistencies in -wid handling.
reimar
parents:
27943
diff
changeset
|
528 if (vo_fs) |
f7b92cea7436
Use aspect.c code in vo_x11.c. Removes some inconsistencies in -wid handling.
reimar
parents:
27943
diff
changeset
|
529 aspect(&newW, &newH, A_ZOOM); |
12582 | 530 if (sws_flags == 0) |
531 newW &= (~31); // not needed but, if the user wants the FAST_BILINEAR SCALER, then its needed | |
4627 | 532 |
12582 | 533 swsContext = sws_getContextFromCmdLine(srcW, srcH, in_format, |
534 newW, newH, out_format); | |
535 if (swsContext) | |
536 { | |
537 image_width = (newW + 7) & (~7); | |
538 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
|
539 |
12582 | 540 freeMyXImage(); |
541 getMyXImage(); | |
542 sws_freeContext(oldContext); | |
543 } else | |
544 { | |
545 swsContext = oldContext; | |
546 } | |
18746 | 547 dst_width = newW; |
12582 | 548 } |
549 | |
23284 | 550 dstStride[0] = image_width * ((bpp + 7) / 8); |
551 dst[0] = ImageData; | |
12582 | 552 if (Flip_Flag) |
553 { | |
23284 | 554 dst[0] += dstStride[0] * (image_height - 1); |
555 dstStride[0] = -dstStride[0]; | |
12582 | 556 } |
30150
16c71b965952
Replace deprecated sws_scale_ordered usages by sws_scale (which does the same).
reimar
parents:
29401
diff
changeset
|
557 sws_scale(swsContext, src, stride, y, h, dst, dstStride); |
12582 | 558 return 0; |
1 | 559 } |
560 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
561 static int draw_frame(uint8_t * src[]) |
12582 | 562 { |
27883
96831cf06109
Remove code from unused and since ages deprecated draw_frame function.
reimar
parents:
27881
diff
changeset
|
563 return VO_ERROR; |
7683 | 564 } |
565 | |
12582 | 566 static uint32_t get_image(mp_image_t * mpi) |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
567 { |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
568 if (zoomFlag || |
12582 | 569 !IMGFMT_IS_BGR(mpi->imgfmt) || |
570 (IMGFMT_BGR_DEPTH(mpi->imgfmt) != vo_depthonscreen) || | |
571 ((mpi->type != MP_IMGTYPE_STATIC) | |
572 && (mpi->type != MP_IMGTYPE_TEMP)) | |
573 || (mpi->flags & MP_IMGFLAG_PLANAR) | |
574 || (mpi->flags & MP_IMGFLAG_YUV) || (mpi->width != image_width) | |
575 || (mpi->height != image_height)) | |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
25962
diff
changeset
|
576 return VO_FALSE; |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
577 |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
578 if (Flip_Flag) |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
579 { |
12582 | 580 mpi->stride[0] = -image_width * ((bpp + 7) / 8); |
581 mpi->planes[0] = ImageData - mpi->stride[0] * (image_height - 1); | |
582 } else | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
583 { |
12582 | 584 mpi->stride[0] = image_width * ((bpp + 7) / 8); |
585 mpi->planes[0] = ImageData; | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
586 } |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
587 mpi->flags |= MP_IMGFLAG_DIRECT; |
12582 | 588 |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
25962
diff
changeset
|
589 return VO_TRUE; |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
590 } |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
591 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
592 static int query_format(uint32_t format) |
1 | 593 { |
12582 | 594 mp_msg(MSGT_VO, MSGL_DBG2, |
595 "vo_x11: query_format was called: %x (%s)\n", format, | |
596 vo_format_name(format)); | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
597 if (IMGFMT_IS_BGR(format)) |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
598 { |
12582 | 599 if (IMGFMT_BGR_DEPTH(format) <= 8) |
600 return 0; // TODO 8bpp not yet fully implemented | |
601 if (IMGFMT_BGR_DEPTH(format) == vo_depthonscreen) | |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
602 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP | |
12582 | 603 VFCAP_ACCEPT_STRIDE; |
604 else | |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
605 return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP | |
12582 | 606 VFCAP_ACCEPT_STRIDE; |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
607 } |
325 | 608 |
12582 | 609 switch (format) |
610 { | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29062
diff
changeset
|
611 // case IMGFMT_BGR8: |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
612 // case IMGFMT_BGR15: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
613 // case IMGFMT_BGR16: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
614 // case IMGFMT_BGR24: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
615 // case IMGFMT_BGR32: |
6694
9291268a3603
1000l, back out hack-n-slay 8bpp code from my local tree.
atmos4
parents:
6693
diff
changeset
|
616 // return 0x2; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29062
diff
changeset
|
617 // case IMGFMT_YUY2: |
12582 | 618 case IMGFMT_I420: |
619 case IMGFMT_IYUV: | |
620 case IMGFMT_YV12: | |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
621 return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_ACCEPT_STRIDE; |
12582 | 622 } |
623 return 0; | |
1 | 624 } |
625 | |
626 | |
7683 | 627 static void uninit(void) |
1 | 628 { |
12582 | 629 if (!myximage) |
630 return; | |
631 | |
632 freeMyXImage(); | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
633 |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
634 #ifdef CONFIG_XF86VM |
27890
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
635 vo_vm_close(); |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
636 #endif |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
637 |
12582 | 638 zoomFlag = 0; |
639 vo_x11_uninit(); | |
4677
305a0c20bde4
default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents:
4662
diff
changeset
|
640 |
12582 | 641 sws_freeContext(swsContext); |
1 | 642 } |
643 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
644 static int preinit(const char *arg) |
4352 | 645 { |
12582 | 646 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
|
647 { |
12582 | 648 mp_msg(MSGT_VO, MSGL_ERR, "vo_x11: Unknown subdevice: %s\n", arg); |
649 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
|
650 } |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
651 |
12582 | 652 if (!vo_init()) |
653 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
|
654 return 0; |
4352 | 655 } |
1 | 656 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
657 static int control(uint32_t request, void *data, ...) |
4352 | 658 { |
12582 | 659 switch (request) |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
660 { |
12582 | 661 case VOCTRL_PAUSE: |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
25962
diff
changeset
|
662 return int_pause = 1; |
12582 | 663 case VOCTRL_RESUME: |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
25962
diff
changeset
|
664 return int_pause = 0; |
12582 | 665 case VOCTRL_QUERY_FORMAT: |
666 return query_format(*((uint32_t *) data)); | |
27879
514afc9b920e
Cosmetics for vo_x11 control() to make it more similar to vo_xv.c
reimar
parents:
27762
diff
changeset
|
667 case VOCTRL_GET_IMAGE: |
514afc9b920e
Cosmetics for vo_x11 control() to make it more similar to vo_xv.c
reimar
parents:
27762
diff
changeset
|
668 return get_image(data); |
12582 | 669 case VOCTRL_GUISUPPORT: |
670 return VO_TRUE; | |
27879
514afc9b920e
Cosmetics for vo_x11 control() to make it more similar to vo_xv.c
reimar
parents:
27762
diff
changeset
|
671 case VOCTRL_FULLSCREEN: |
514afc9b920e
Cosmetics for vo_x11 control() to make it more similar to vo_xv.c
reimar
parents:
27762
diff
changeset
|
672 vo_x11_fullscreen(); |
514afc9b920e
Cosmetics for vo_x11 control() to make it more similar to vo_xv.c
reimar
parents:
27762
diff
changeset
|
673 vo_x11_clearwindow(mDisplay, vo_window); |
514afc9b920e
Cosmetics for vo_x11 control() to make it more similar to vo_xv.c
reimar
parents:
27762
diff
changeset
|
674 return VO_TRUE; |
12582 | 675 case VOCTRL_SET_EQUALIZER: |
676 { | |
677 va_list ap; | |
678 int value; | |
679 | |
680 va_start(ap, data); | |
681 value = va_arg(ap, int); | |
682 | |
683 va_end(ap); | |
684 return vo_x11_set_equalizer(data, value); | |
685 } | |
686 case VOCTRL_GET_EQUALIZER: | |
687 { | |
688 va_list ap; | |
689 int *value; | |
690 | |
691 va_start(ap, data); | |
692 value = va_arg(ap, int *); | |
693 | |
694 va_end(ap); | |
695 return vo_x11_get_equalizer(data, value); | |
696 } | |
697 case VOCTRL_ONTOP: | |
698 vo_x11_ontop(); | |
699 return VO_TRUE; | |
22232 | 700 case VOCTRL_UPDATE_SCREENINFO: |
701 update_xinerama_info(); | |
702 return VO_TRUE; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
703 } |
12582 | 704 return VO_NOTIMPL; |
4352 | 705 } |