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