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