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