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